Commit 115d2098 authored by David S. Miller's avatar David S. Miller

[SUNQE]: Fix iomem warnings.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fdf6f967
...@@ -49,7 +49,7 @@ static void qe_set_multicast(struct net_device *dev); ...@@ -49,7 +49,7 @@ static void qe_set_multicast(struct net_device *dev);
#define QEC_RESET_TRIES 200 #define QEC_RESET_TRIES 200
static inline int qec_global_reset(unsigned long gregs) static inline int qec_global_reset(void __iomem *gregs)
{ {
int tries = QEC_RESET_TRIES; int tries = QEC_RESET_TRIES;
...@@ -73,8 +73,8 @@ static inline int qec_global_reset(unsigned long gregs) ...@@ -73,8 +73,8 @@ static inline int qec_global_reset(unsigned long gregs)
static inline int qe_stop(struct sunqe *qep) static inline int qe_stop(struct sunqe *qep)
{ {
unsigned long cregs = qep->qcregs; void __iomem *cregs = qep->qcregs;
unsigned long mregs = qep->mregs; void __iomem *mregs = qep->mregs;
int tries; int tries;
/* Reset the MACE, then the QEC channel. */ /* Reset the MACE, then the QEC channel. */
...@@ -130,9 +130,9 @@ static void qe_init_rings(struct sunqe *qep) ...@@ -130,9 +130,9 @@ static void qe_init_rings(struct sunqe *qep)
static int qe_init(struct sunqe *qep, int from_irq) static int qe_init(struct sunqe *qep, int from_irq)
{ {
struct sunqec *qecp = qep->parent; struct sunqec *qecp = qep->parent;
unsigned long cregs = qep->qcregs; void __iomem *cregs = qep->qcregs;
unsigned long mregs = qep->mregs; void __iomem *mregs = qep->mregs;
unsigned long gregs = qecp->gregs; void __iomem *gregs = qecp->gregs;
unsigned char *e = &qep->dev->dev_addr[0]; unsigned char *e = &qep->dev->dev_addr[0];
u32 tmp; u32 tmp;
int i; int i;
...@@ -699,7 +699,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) ...@@ -699,7 +699,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
static u32 qe_get_link(struct net_device *dev) static u32 qe_get_link(struct net_device *dev)
{ {
struct sunqe *qep = dev->priv; struct sunqe *qep = dev->priv;
unsigned long mregs = qep->mregs; void __iomem *mregs = qep->mregs;
u8 phyconfig; u8 phyconfig;
spin_lock_irq(&qep->lock); spin_lock_irq(&qep->lock);
......
...@@ -311,7 +311,7 @@ struct qe_init_block { ...@@ -311,7 +311,7 @@ struct qe_init_block {
struct sunqe; struct sunqe;
struct sunqec { struct sunqec {
unsigned long gregs; /* QEC Global Registers */ void __iomem *gregs; /* QEC Global Registers */
struct sunqe *qes[4]; /* Each child MACE */ struct sunqe *qes[4]; /* Each child MACE */
unsigned int qec_bursts; /* Support burst sizes */ unsigned int qec_bursts; /* Support burst sizes */
struct sbus_dev *qec_sdev; /* QEC's SBUS device */ struct sbus_dev *qec_sdev; /* QEC's SBUS device */
...@@ -331,8 +331,8 @@ struct sunqe_buffers { ...@@ -331,8 +331,8 @@ struct sunqe_buffers {
((__u32)((unsigned long)(&(((struct sunqe_buffers *)0)->mem[elem][0])))) ((__u32)((unsigned long)(&(((struct sunqe_buffers *)0)->mem[elem][0]))))
struct sunqe { struct sunqe {
unsigned long qcregs; /* QEC per-channel Registers */ void __iomem *qcregs; /* QEC per-channel Registers */
unsigned long mregs; /* Per-channel MACE Registers */ void __iomem *mregs; /* Per-channel MACE Registers */
struct qe_init_block *qe_block; /* RX and TX descriptors */ struct qe_init_block *qe_block; /* RX and TX descriptors */
__u32 qblock_dvma; /* RX and TX descriptors */ __u32 qblock_dvma; /* RX and TX descriptors */
spinlock_t lock; /* Protects txfull state */ spinlock_t lock; /* Protects txfull state */
......
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