hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] ibm_emac sparse annotations 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2005-12-01 10:15:21 -05:00
parent d0f6ecad39
commit b43de2d8db
6 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/net/ibm_emac/ibm_emac_core.c
View File

@ -204,7 +204,7 @@ static inline int emac_phy_gpcs(int phy_mode)
static inline void emac_tx_enable(struct ocp_enet_private *dev) static inline void emac_tx_enable(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
unsigned long flags; unsigned long flags;
u32 r; u32 r;
@ -220,7 +220,7 @@ static inline void emac_tx_enable(struct ocp_enet_private *dev)
static void emac_tx_disable(struct ocp_enet_private *dev) static void emac_tx_disable(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
unsigned long flags; unsigned long flags;
u32 r; u32 r;
@ -244,7 +244,7 @@ static void emac_tx_disable(struct ocp_enet_private *dev)
static void emac_rx_enable(struct ocp_enet_private *dev) static void emac_rx_enable(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
unsigned long flags; unsigned long flags;
u32 r; u32 r;
@ -275,7 +275,7 @@ static void emac_rx_enable(struct ocp_enet_private *dev)
static void emac_rx_disable(struct ocp_enet_private *dev) static void emac_rx_disable(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
unsigned long flags; unsigned long flags;
u32 r; u32 r;
@ -299,7 +299,7 @@ static void emac_rx_disable(struct ocp_enet_private *dev)
static inline void emac_rx_disable_async(struct ocp_enet_private *dev) static inline void emac_rx_disable_async(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
unsigned long flags; unsigned long flags;
u32 r; u32 r;
@ -315,7 +315,7 @@ static inline void emac_rx_disable_async(struct ocp_enet_private *dev)
static int emac_reset(struct ocp_enet_private *dev) static int emac_reset(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
unsigned long flags; unsigned long flags;
int n = 20; int n = 20;
@ -348,7 +348,7 @@ static int emac_reset(struct ocp_enet_private *dev)
static void emac_hash_mc(struct ocp_enet_private *dev) static void emac_hash_mc(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
u16 gaht[4] = { 0 }; u16 gaht[4] = { 0 };
struct dev_mc_list *dmi; struct dev_mc_list *dmi;
@ -393,7 +393,7 @@ static inline int emac_opb_mhz(void)
/* BHs disabled */ /* BHs disabled */
static int emac_configure(struct ocp_enet_private *dev) static int emac_configure(struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
struct net_device *ndev = dev->ndev; struct net_device *ndev = dev->ndev;
int gige; int gige;
u32 r; u32 r;
@ -555,7 +555,7 @@ static void emac_full_tx_reset(struct net_device *ndev)
static int __emac_mdio_read(struct ocp_enet_private *dev, u8 id, u8 reg) static int __emac_mdio_read(struct ocp_enet_private *dev, u8 id, u8 reg)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
u32 r; u32 r;
int n; int n;
@ -604,7 +604,7 @@ static int __emac_mdio_read(struct ocp_enet_private *dev, u8 id, u8 reg)
static void __emac_mdio_write(struct ocp_enet_private *dev, u8 id, u8 reg, static void __emac_mdio_write(struct ocp_enet_private *dev, u8 id, u8 reg,
u16 val) u16 val)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
int n; int n;
DBG2("%d: mdio_write(%02x,%02x,%04x)" NL, dev->def->index, id, reg, DBG2("%d: mdio_write(%02x,%02x,%04x)" NL, dev->def->index, id, reg,
@ -666,7 +666,7 @@ static void emac_mdio_write(struct net_device *ndev, int id, int reg, int val)
static void emac_set_multicast_list(struct net_device *ndev) static void emac_set_multicast_list(struct net_device *ndev)
{ {
struct ocp_enet_private *dev = ndev->priv; struct ocp_enet_private *dev = ndev->priv;
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
u32 rmr = emac_iff2rmr(ndev); u32 rmr = emac_iff2rmr(ndev);
DBG("%d: multicast %08x" NL, dev->def->index, rmr); DBG("%d: multicast %08x" NL, dev->def->index, rmr);
@ -825,7 +825,7 @@ static void emac_clean_rx_ring(struct ocp_enet_private *dev)
} }
static inline int emac_alloc_rx_skb(struct ocp_enet_private *dev, int slot, static inline int emac_alloc_rx_skb(struct ocp_enet_private *dev, int slot,
int flags) gfp_t flags)
{ {
struct sk_buff *skb = alloc_skb(dev->rx_skb_size, flags); struct sk_buff *skb = alloc_skb(dev->rx_skb_size, flags);
if (unlikely(!skb)) if (unlikely(!skb))
@ -1047,7 +1047,7 @@ static inline u16 emac_tx_csum(struct ocp_enet_private *dev,
static inline int emac_xmit_finish(struct ocp_enet_private *dev, int len) static inline int emac_xmit_finish(struct ocp_enet_private *dev, int len)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
struct net_device *ndev = dev->ndev; struct net_device *ndev = dev->ndev;
/* Send the packet out */ /* Send the packet out */
@ -1519,7 +1519,7 @@ static void emac_rxde(void *param)
static irqreturn_t emac_irq(int irq, void *dev_instance, struct pt_regs *regs) static irqreturn_t emac_irq(int irq, void *dev_instance, struct pt_regs *regs)
{ {
struct ocp_enet_private *dev = dev_instance; struct ocp_enet_private *dev = dev_instance;
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
struct ibm_emac_error_stats *st = &dev->estats; struct ibm_emac_error_stats *st = &dev->estats;
u32 isr = in_be32(&p->isr); u32 isr = in_be32(&p->isr);
@ -1619,17 +1619,17 @@ static void emac_remove(struct ocp_device *ocpdev)
DBG("%d: remove" NL, dev->def->index); DBG("%d: remove" NL, dev->def->index);
ocp_set_drvdata(ocpdev, 0); ocp_set_drvdata(ocpdev, NULL);
unregister_netdev(dev->ndev); unregister_netdev(dev->ndev);
tah_fini(dev->tah_dev); tah_fini(dev->tah_dev);
rgmii_fini(dev->rgmii_dev, dev->rgmii_input); rgmii_fini(dev->rgmii_dev, dev->rgmii_input);
zmii_fini(dev->zmii_dev, dev->zmii_input); zmii_fini(dev->zmii_dev, dev->zmii_input);
emac_dbg_register(dev->def->index, 0); emac_dbg_register(dev->def->index, NULL);
mal_unregister_commac(dev->mal, &dev->commac); mal_unregister_commac(dev->mal, &dev->commac);
iounmap((void *)dev->emacp); iounmap(dev->emacp);
kfree(dev->ndev); kfree(dev->ndev);
} }
@ -2048,9 +2048,7 @@ static int __init emac_probe(struct ocp_device *ocpdev)
goto out4; goto out4;
/* Map EMAC regs */ /* Map EMAC regs */
dev->emacp = dev->emacp = ioremap(dev->def->paddr, sizeof(struct emac_regs));
(struct emac_regs *)ioremap(dev->def->paddr,
sizeof(struct emac_regs));
if (!dev->emacp) { if (!dev->emacp) {
printk(KERN_ERR "emac%d: could not ioremap device registers!\n", printk(KERN_ERR "emac%d: could not ioremap device registers!\n",
dev->def->index); dev->def->index);
@ -2210,7 +2208,7 @@ static int __init emac_probe(struct ocp_device *ocpdev)
return 0; return 0;
out6: out6:
iounmap((void *)dev->emacp); iounmap(dev->emacp);
out5: out5:
tah_fini(dev->tah_dev); tah_fini(dev->tah_dev);
out4: out4:

2
drivers/net/ibm_emac/ibm_emac_core.h
View File

@ -155,7 +155,7 @@ struct ibm_emac_error_stats {
struct ocp_enet_private { struct ocp_enet_private {
struct net_device *ndev; /* 0 */ struct net_device *ndev; /* 0 */
struct emac_regs *emacp; struct emac_regs __iomem *emacp;
struct mal_descriptor *tx_desc; struct mal_descriptor *tx_desc;
int tx_cnt; int tx_cnt;

2
drivers/net/ibm_emac/ibm_emac_debug.c
View File

@ -58,7 +58,7 @@ static void emac_desc_dump(int idx, struct ocp_enet_private *p)
static void emac_mac_dump(int idx, struct ocp_enet_private *dev) static void emac_mac_dump(int idx, struct ocp_enet_private *dev)
{ {
struct emac_regs *p = dev->emacp; struct emac_regs __iomem *p = dev->emacp;
printk("** EMAC%d registers **\n" printk("** EMAC%d registers **\n"
"MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n" "MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n"

2
drivers/net/ibm_emac/ibm_emac_rgmii.h
View File

@ -31,7 +31,7 @@ struct rgmii_regs {
/* RGMII device */ /* RGMII device */
struct ibm_ocp_rgmii { struct ibm_ocp_rgmii {
struct rgmii_regs *base; struct rgmii_regs __iomem *base;
int users; /* number of EMACs using this RGMII bridge */ int users; /* number of EMACs using this RGMII bridge */
}; };

7
drivers/net/ibm_emac/ibm_emac_zmii.c
View File

@ -80,7 +80,7 @@ static inline u32 zmii_mode_mask(int mode, int input)
static int __init zmii_init(struct ocp_device *ocpdev, int input, int *mode) static int __init zmii_init(struct ocp_device *ocpdev, int input, int *mode)
{ {
struct ibm_ocp_zmii *dev = ocp_get_drvdata(ocpdev); struct ibm_ocp_zmii *dev = ocp_get_drvdata(ocpdev);
struct zmii_regs *p; struct zmii_regs __iomem *p;
ZMII_DBG("%d: init(%d, %d)" NL, ocpdev->def->index, input, *mode); ZMII_DBG("%d: init(%d, %d)" NL, ocpdev->def->index, input, *mode);
@ -94,8 +94,7 @@ static int __init zmii_init(struct ocp_device *ocpdev, int input, int *mode)
} }
dev->mode = PHY_MODE_NA; dev->mode = PHY_MODE_NA;
p = (struct zmii_regs *)ioremap(ocpdev->def->paddr, p = ioremap(ocpdev->def->paddr, sizeof(struct zmii_regs));
sizeof(struct zmii_regs));
if (!p) { if (!p) {
printk(KERN_ERR printk(KERN_ERR
"zmii%d: could not ioremap device registers!\n", "zmii%d: could not ioremap device registers!\n",
@ -231,7 +230,7 @@ void __exit __zmii_fini(struct ocp_device *ocpdev, int input)
if (!--dev->users) { if (!--dev->users) {
/* Free everything if this is the last user */ /* Free everything if this is the last user */
ocp_set_drvdata(ocpdev, NULL); ocp_set_drvdata(ocpdev, NULL);
iounmap((void *)dev->base); iounmap(dev->base);
kfree(dev); kfree(dev);
} }
} }

2
drivers/net/ibm_emac/ibm_emac_zmii.h
View File

@ -32,7 +32,7 @@ struct zmii_regs {
/* ZMII device */ /* ZMII device */
struct ibm_ocp_zmii { struct ibm_ocp_zmii {
struct zmii_regs *base; struct zmii_regs __iomem *base;
int mode; /* subset of PHY_MODE_XXXX */ int mode; /* subset of PHY_MODE_XXXX */
int users; /* number of EMACs using this ZMII bridge */ int users; /* number of EMACs using this ZMII bridge */
u32 fer_save; /* FER value left by firmware */ u32 fer_save; /* FER value left by firmware */