-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch fixes inconsistent use of netdev, dev and priv variable names.
Signed-off-by: Sebastian Haas <[email protected]> ems_usb.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) Index: drivers/net/can/ems_usb.c =================================================================== - --- drivers/net/can/ems_usb.c (Revision 1053) +++ drivers/net/can/ems_usb.c (Arbeitskopie) @@ -885,22 +885,22 @@ return NETDEV_TX_OK; } - -static int ems_usb_close(struct net_device *dev) +static int ems_usb_close(struct net_device *netdev) { - - struct ems_usb *priv = netdev_priv(dev); + struct ems_usb *dev = netdev_priv(netdev); - - netif_stop_queue(dev); + netif_stop_queue(netdev); /* Stop polling */ - - unlink_all_urbs(priv); + unlink_all_urbs(dev); /* Set CAN controller to reset mode */ - - if (ems_usb_write_mode(priv, SJA1000_MOD_RM)) - - dev_warn(ND2D(dev), "couldn't stop device"); + if (ems_usb_write_mode(dev, SJA1000_MOD_RM)) + dev_warn(ND2D(netdev), "couldn't stop device"); - - close_candev(dev); + close_candev(netdev); - - priv->open_time = 0; + dev->open_time = 0; return 0; } @@ -925,20 +925,20 @@ .brp_inc = 1, }; - -static int ems_usb_set_mode(struct net_device *dev, enum can_mode mode) +static int ems_usb_set_mode(struct net_device *netdev, enum can_mode mode) { - - struct ems_usb *priv = netdev_priv(dev); + struct ems_usb *dev = netdev_priv(netdev); - - if (!priv->open_time) + if (!dev->open_time) return -EINVAL; switch (mode) { case CAN_MODE_START: - - if (ems_usb_write_mode(priv, SJA1000_MOD_NORMAL)) - - dev_warn(ND2D(dev), "couldn't start device"); + if (ems_usb_write_mode(dev, SJA1000_MOD_NORMAL)) + dev_warn(ND2D(netdev), "couldn't start device"); - - if (netif_queue_stopped(dev)) - - netif_wake_queue(dev); + if (netif_queue_stopped(netdev)) + netif_wake_queue(netdev); break; default: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkqo8L0ACgkQpqRB8PJG7XwqKwCfRmlPMrWgc/YHwAKe1hO+miBR BGYAoJQqx1q3Hhgv4wQsZUvrpq8KQ4JY =Gnr3 -----END PGP SIGNATURE----- -- EMS Dr. Thomas Wuensche e.K. Sonnenhang 3 85304 Ilmmuenster HRA Neuburg a.d. Donau, HR-Nr. 70.106 Phone: +49-8441-490260 Fax : +49-8441-81860 http://www.ems-wuensche.com _______________________________________________ Socketcan-core mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-core
