[<prev] [next>] [day] [month] [year] [list]
Message-Id: <E1eXXiW-0002AD-I2@ZenIV.linux.org.uk>
Date: Fri, 05 Jan 2018 19:31:48 +0000
From: Al Viro <viro@....linux.org.uk>
To: netdev@...r.kernel.org
Cc: <peppe.cavallaro@...com>, Cavallaro@....linux.org.uk,
Giuseppe@....linux.org.uk
Subject: Subject: [RFC][PATCH 03/11] stmmac: trivial sparse annotations
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c
index 85ce80c600c7..b069a3d99356 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c
@@ -20,18 +20,18 @@
#define GMAC_CONFIG_INTF_RGMII (0x1 << 0)
struct anarion_gmac {
- uintptr_t ctl_block;
+ void __iomem *ctl_block;
uint32_t phy_intf_sel;
};
static uint32_t gmac_read_reg(struct anarion_gmac *gmac, uint8_t reg)
{
- return readl((void *)(gmac->ctl_block + reg));
+ return readl(gmac->ctl_block + reg);
};
static void gmac_write_reg(struct anarion_gmac *gmac, uint8_t reg, uint32_t val)
{
- writel(val, (void *)(gmac->ctl_block + reg));
+ writel(val, gmac->ctl_block + reg);
}
static int anarion_gmac_init(struct platform_device *pdev, void *priv)
@@ -71,14 +71,14 @@ static struct anarion_gmac *anarion_config_dt(struct platform_device *pdev)
if (IS_ERR(ctl_block)) {
dev_err(&pdev->dev, "Cannot get reset region (%ld)!\n",
PTR_ERR(ctl_block));
- return ctl_block;
+ return ERR_CAST(ctl_block);
}
gmac = devm_kzalloc(&pdev->dev, sizeof(*gmac), GFP_KERNEL);
if (!gmac)
return ERR_PTR(-ENOMEM);
- gmac->ctl_block = (uintptr_t)ctl_block;
+ gmac->ctl_block = ctl_block;
phy_mode = of_get_phy_mode(pdev->dev.of_node);
switch (phy_mode) {
--
2.11.0
Powered by blists - more mailing lists