can: sja1000: stop misusing member base_addr of struct net_device

[firefly-linux-kernel-4.4.55.git] / drivers / net / can / sja1000 / sja1000.h

diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h
index ccd3028879649727505d2fbe9b1ed8d946dc981a..302d2c763ad7cfb3c2a18da3a2911e2cf786b876 100644 (file)
--- a/drivers/net/can/sja1000/sja1000.h
+++ b/drivers/net/can/sja1000/sja1000.h
@@ -155,14 +155,15 @@ struct sja1000_priv {
        struct sk_buff *echo_skb;
 
        /* the lower-layer is responsible for appropriate locking */
-       u8 (*read_reg) (const struct net_device *dev, int reg);
-       void (*write_reg) (const struct net_device *dev, int reg, u8 val);
-       void (*pre_irq) (const struct net_device *dev);
-       void (*post_irq) (const struct net_device *dev);
+       u8 (*read_reg) (const struct sja1000_priv *priv, int reg);
+       void (*write_reg) (const struct sja1000_priv *priv, int reg, u8 val);
+       void (*pre_irq) (const struct sja1000_priv *priv);
+       void (*post_irq) (const struct sja1000_priv *priv);
 
        void *priv;             /* for board-specific data */
        struct net_device *dev;
 
+       void __iomem *reg_base;  /* ioremap'ed address to registers */
        unsigned long irq_flags; /* for request_irq() */
 
        u16 flags;              /* custom mode flags */