Skip to content

L
linux
Commit 2f5a21d6 authored by Alexander Viro's avatar Alexander Viro Committed by Jeff Garzik
Browse files
Options

[PATCH] mace iomem annotations - trivial part 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
parent ff92f80b
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 34 deletions
drivers/net/mace.c
View file @ 2f5a21d6
...@@ -40,10 +40,10 @@ static int port_aaui = -1; ...@@ -40,10 +40,10 @@ static int port_aaui = -1;
#define TX_DMA_ERR 0x80 #define TX_DMA_ERR 0x80
struct mace_data { struct mace_data {
volatile struct mace *mace; volatile struct mace __iomem *mace;
volatile struct dbdma_regs *tx_dma; volatile struct dbdma_regs __iomem *tx_dma;
int tx_dma_intr; int tx_dma_intr;
volatile struct dbdma_regs *rx_dma; volatile struct dbdma_regs __iomem *rx_dma;
int rx_dma_intr; int rx_dma_intr;
volatile struct dbdma_cmd *tx_cmds; /* xmit dma command list */ volatile struct dbdma_cmd *tx_cmds; /* xmit dma command list */
volatile struct dbdma_cmd *rx_cmds; /* recv dma command list */ volatile struct dbdma_cmd *rx_cmds; /* recv dma command list */
...@@ -88,7 +88,7 @@ static irqreturn_t mace_txdma_intr(int irq, void *dev_id, struct pt_regs *regs); ...@@ -88,7 +88,7 @@ static irqreturn_t mace_txdma_intr(int irq, void *dev_id, struct pt_regs *regs);
static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs);
static void mace_set_timeout(struct net_device *dev); static void mace_set_timeout(struct net_device *dev);
static void mace_tx_timeout(unsigned long data); static void mace_tx_timeout(unsigned long data);
static inline void dbdma_reset(volatile struct dbdma_regs *dma); static inline void dbdma_reset(volatile struct dbdma_regs __iomem *dma);
static inline void mace_clean_rings(struct mace_data *mp); static inline void mace_clean_rings(struct mace_data *mp);
static void __mace_set_address(struct net_device *dev, void *addr); static void __mace_set_address(struct net_device *dev, void *addr);
...@@ -164,7 +164,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m ...@@ -164,7 +164,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m
macio_set_drvdata(mdev, dev); macio_set_drvdata(mdev, dev);
dev->base_addr = macio_resource_start(mdev, 0); dev->base_addr = macio_resource_start(mdev, 0);
mp->mace = (volatile struct mace *)ioremap(dev->base_addr, 0x1000); mp->mace = ioremap(dev->base_addr, 0x1000);
if (mp->mace == NULL) { if (mp->mace == NULL) {
printk(KERN_ERR "MACE: can't map IO resources !\n"); printk(KERN_ERR "MACE: can't map IO resources !\n");
rc = -ENOMEM; rc = -ENOMEM;
...@@ -183,8 +183,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m ...@@ -183,8 +183,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m
mp = (struct mace_data *) dev->priv; mp = (struct mace_data *) dev->priv;
mp->maccc = ENXMT | ENRCV; mp->maccc = ENXMT | ENRCV;
mp->tx_dma = (volatile struct dbdma_regs *) mp->tx_dma = ioremap(macio_resource_start(mdev, 1), 0x1000);
ioremap(macio_resource_start(mdev, 1), 0x1000);
if (mp->tx_dma == NULL) { if (mp->tx_dma == NULL) {
printk(KERN_ERR "MACE: can't map TX DMA resources !\n"); printk(KERN_ERR "MACE: can't map TX DMA resources !\n");
rc = -ENOMEM; rc = -ENOMEM;
...@@ -192,8 +191,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m ...@@ -192,8 +191,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m
} }
mp->tx_dma_intr = macio_irq(mdev, 1); mp->tx_dma_intr = macio_irq(mdev, 1);
mp->rx_dma = (volatile struct dbdma_regs *) mp->rx_dma = ioremap(macio_resource_start(mdev, 2), 0x1000);
ioremap(macio_resource_start(mdev, 2), 0x1000);
if (mp->rx_dma == NULL) { if (mp->rx_dma == NULL) {
printk(KERN_ERR "MACE: can't map RX DMA resources !\n"); printk(KERN_ERR "MACE: can't map RX DMA resources !\n");
rc = -ENOMEM; rc = -ENOMEM;
...@@ -275,11 +273,11 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m ...@@ -275,11 +273,11 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m
err_free_irq: err_free_irq:
free_irq(macio_irq(mdev, 0), dev); free_irq(macio_irq(mdev, 0), dev);
err_unmap_rx_dma: err_unmap_rx_dma:
iounmap((void*)mp->rx_dma); iounmap(mp->rx_dma);
err_unmap_tx_dma: err_unmap_tx_dma:
iounmap((void*)mp->tx_dma); iounmap(mp->tx_dma);
err_unmap_io: err_unmap_io:
iounmap((void*)mp->mace); iounmap(mp->mace);
err_free: err_free:
free_netdev(dev); free_netdev(dev);
err_release: err_release:
...@@ -305,9 +303,9 @@ static int __devexit mace_remove(struct macio_dev *mdev) ...@@ -305,9 +303,9 @@ static int __devexit mace_remove(struct macio_dev *mdev)
free_irq(mp->tx_dma_intr, dev); free_irq(mp->tx_dma_intr, dev);
free_irq(mp->rx_dma_intr, dev); free_irq(mp->rx_dma_intr, dev);
iounmap((void*)mp->rx_dma); iounmap(mp->rx_dma);
iounmap((void*)mp->tx_dma); iounmap(mp->tx_dma);
iounmap((void*)mp->mace); iounmap(mp->mace);
free_netdev(dev); free_netdev(dev);
...@@ -316,7 +314,7 @@ static int __devexit mace_remove(struct macio_dev *mdev) ...@@ -316,7 +314,7 @@ static int __devexit mace_remove(struct macio_dev *mdev)
return 0; return 0;
} }
static void dbdma_reset(volatile struct dbdma_regs *dma) static void dbdma_reset(volatile struct dbdma_regs __iomem *dma)
{ {
int i; int i;
...@@ -334,7 +332,7 @@ static void dbdma_reset(volatile struct dbdma_regs *dma) ...@@ -334,7 +332,7 @@ static void dbdma_reset(volatile struct dbdma_regs *dma)
static void mace_reset(struct net_device *dev) static void mace_reset(struct net_device *dev)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
int i; int i;
/* soft-reset the chip */ /* soft-reset the chip */
...@@ -389,7 +387,7 @@ static void mace_reset(struct net_device *dev) ...@@ -389,7 +387,7 @@ static void mace_reset(struct net_device *dev)
static void __mace_set_address(struct net_device *dev, void *addr) static void __mace_set_address(struct net_device *dev, void *addr)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
unsigned char *p = addr; unsigned char *p = addr;
int i; int i;
...@@ -410,7 +408,7 @@ static void __mace_set_address(struct net_device *dev, void *addr) ...@@ -410,7 +408,7 @@ static void __mace_set_address(struct net_device *dev, void *addr)
static int mace_set_address(struct net_device *dev, void *addr) static int mace_set_address(struct net_device *dev, void *addr)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&mp->lock, flags); spin_lock_irqsave(&mp->lock, flags);
...@@ -445,9 +443,9 @@ static inline void mace_clean_rings(struct mace_data *mp) ...@@ -445,9 +443,9 @@ static inline void mace_clean_rings(struct mace_data *mp)
static int mace_open(struct net_device *dev) static int mace_open(struct net_device *dev)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_regs __iomem *rd = mp->rx_dma;
volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_regs __iomem *td = mp->tx_dma;
volatile struct dbdma_cmd *cp; volatile struct dbdma_cmd *cp;
int i; int i;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -515,9 +513,9 @@ static int mace_open(struct net_device *dev) ...@@ -515,9 +513,9 @@ static int mace_open(struct net_device *dev)
static int mace_close(struct net_device *dev) static int mace_close(struct net_device *dev)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_regs __iomem *rd = mp->rx_dma;
volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_regs __iomem *td = mp->tx_dma;
/* disable rx and tx */ /* disable rx and tx */
out_8(&mb->maccc, 0); out_8(&mb->maccc, 0);
...@@ -548,7 +546,7 @@ static inline void mace_set_timeout(struct net_device *dev) ...@@ -548,7 +546,7 @@ static inline void mace_set_timeout(struct net_device *dev)
static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev) static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_regs __iomem *td = mp->tx_dma;
volatile struct dbdma_cmd *cp, *np; volatile struct dbdma_cmd *cp, *np;
unsigned long flags; unsigned long flags;
int fill, next, len; int fill, next, len;
...@@ -610,7 +608,7 @@ static struct net_device_stats *mace_stats(struct net_device *dev) ...@@ -610,7 +608,7 @@ static struct net_device_stats *mace_stats(struct net_device *dev)
static void mace_set_multicast(struct net_device *dev) static void mace_set_multicast(struct net_device *dev)
{ {
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
int i, j; int i, j;
u32 crc; u32 crc;
unsigned long flags; unsigned long flags;
...@@ -662,7 +660,7 @@ static void mace_set_multicast(struct net_device *dev) ...@@ -662,7 +660,7 @@ static void mace_set_multicast(struct net_device *dev)
static void mace_handle_misc_intrs(struct mace_data *mp, int intr) static void mace_handle_misc_intrs(struct mace_data *mp, int intr)
{ {
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
static int mace_babbles, mace_jabbers; static int mace_babbles, mace_jabbers;
if (intr & MPCO) if (intr & MPCO)
...@@ -685,8 +683,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -685,8 +683,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_regs __iomem *td = mp->tx_dma;
volatile struct dbdma_cmd *cp; volatile struct dbdma_cmd *cp;
int intr, fs, i, stat, x; int intr, fs, i, stat, x;
int xcount, dstat; int xcount, dstat;
...@@ -831,9 +829,9 @@ static void mace_tx_timeout(unsigned long data) ...@@ -831,9 +829,9 @@ static void mace_tx_timeout(unsigned long data)
{ {
struct net_device *dev = (struct net_device *) data; struct net_device *dev = (struct net_device *) data;
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct mace *mb = mp->mace; volatile struct mace __iomem *mb = mp->mace;
volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_regs __iomem *td = mp->tx_dma;
volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_regs __iomem *rd = mp->rx_dma;
volatile struct dbdma_cmd *cp; volatile struct dbdma_cmd *cp;
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -902,7 +900,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -902,7 +900,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
struct mace_data *mp = (struct mace_data *) dev->priv; struct mace_data *mp = (struct mace_data *) dev->priv;
volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_regs __iomem *rd = mp->rx_dma;
volatile struct dbdma_cmd *cp, *np; volatile struct dbdma_cmd *cp, *np;
int i, nb, stat, next; int i, nb, stat, next;
struct sk_buff *skb; struct sk_buff *skb;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7