4 files changed, 8 insertions, 8 deletions

diff --git a/net/can/af_can.c b/net/can/af_can.c
index c4e50852c9f4..3ab8dd2e1282 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -794,9 +794,9 @@ EXPORT_SYMBOL(can_proto_unregister);
  * af_can notifier to create/remove CAN netdevice specific structs
  */
 static int can_notifier(struct notifier_block *nb, unsigned long msg,
-                        void *data)
+                        void *ptr)
 {
-        struct net_device *dev = (struct net_device *)data;
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
         struct dev_rcv_lists *d;
 
         if (!net_eq(dev_net(dev), &init_net))
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 8f113e6ff327..46f20bfafc0e 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1350,9 +1350,9 @@ static int bcm_sendmsg(struct kiocb *iocb, struct socket *sock,
  * notification handler for netdevice status changes
  */
 static int bcm_notifier(struct notifier_block *nb, unsigned long msg,
-                        void *data)
+                        void *ptr)
 {
-        struct net_device *dev = (struct net_device *)data;
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
         struct bcm_sock *bo = container_of(nb, struct bcm_sock, notifier);
         struct sock *sk = &bo->sk;
         struct bcm_op *op;
diff --git a/net/can/gw.c b/net/can/gw.c
index 3ee690e8c7d3..2f291f961a17 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -445,9 +445,9 @@ static inline void cgw_unregister_filter(struct cgw_job *gwj)
 }
 
 static int cgw_notifier(struct notifier_block *nb,
-                        unsigned long msg, void *data)
+                        unsigned long msg, void *ptr)
 {
-        struct net_device *dev = (struct net_device *)data;
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
 
         if (!net_eq(dev_net(dev), &init_net))
                 return NOTIFY_DONE;
diff --git a/net/can/raw.c b/net/can/raw.c
index 1085e65f848e..641e1c895123 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -239,9 +239,9 @@ static int raw_enable_allfilters(struct net_device *dev, struct sock *sk)
 }
 
 static int raw_notifier(struct notifier_block *nb,
-                        unsigned long msg, void *data)
+                        unsigned long msg, void *ptr)
 {
-        struct net_device *dev = (struct net_device *)data;
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
         struct raw_sock *ro = container_of(nb, struct raw_sock, notifier);
         struct sock *sk = &ro->sk;