Commit ae9e78a9 authored by Christophe Leroy's avatar Christophe Leroy Committed by Jakub Kicinski
Browse files

net: fs_enet: Fix address space and base types mismatches 



CHECK   drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c:550:9: warning: cast removes address space '__iomem' of expression
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c:550:9: error: subtraction of different types can't work (different address spaces)
  CC      drivers/net/ethernet/freescale/fs_enet/mii-bitbang.o
  CHECK   drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c:95:31: warning: incorrect type in argument 1 (different base types)
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c:95:31:    expected unsigned int [noderef] [usertype] __iomem *p
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c:95:31:    got restricted __be32 [noderef] [usertype] __iomem *dat
...
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c:63:31: warning: incorrect type in argument 1 (different base types)
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c:63:31:    expected unsigned int [noderef] [usertype] __iomem *p
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c:63:31:    got restricted __be32 [noderef] [usertype] __iomem *dir
...

Fix those address space and base type mismatches reported by sparse.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/25c7965e6aeeb6bbe1b6be5a3c2c7125182fcb02.1691155346.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 78d39027

drivers/net/ethernet/freescale/fs_enet/mac-fcc.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static void tx_restart(struct net_device *dev) 
	}

	/* Now update the TBPTR and dirty flag to the current buffer */

	W32(ep, fen_genfcc.fcc_tbptr,

		(uint) (((void *)recheck_bd - fep->ring_base) +

		(uint)(((void __iomem *)recheck_bd - fep->ring_base) +

		fep->ring_mem_addr));

	fep->dirty_tx = recheck_bd;

drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 


struct bb_info {

	struct mdiobb_ctrl ctrl;

	__be32 __iomem *dir;

	__be32 __iomem *dat;

	u32 __iomem *dir;

	u32 __iomem *dat;

	u32 mdio_msk;

	u32 mdc_msk;

};