net: usbnet: make driver_info const

The driver_info field that is used for describing each of the usb-net
drivers using the usbnet.c core all declare their information as const
and the usbnet.c itself does not try and modify the struct.

It is therefore a good idea to make this const in the usbnet.c structure
in case anyone tries to modify it.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 73aa33364d8053b041ae7ae8b6186010bddb9f47..504282af27e51f656192b729a0fbe3dcd13eb3bf 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -802,7 +802,7 @@ static void usbnet_terminate_urbs(struct usbnet *dev)
 int usbnet_stop (struct net_device *net)
 {
        struct usbnet           *dev = netdev_priv(net);
-       struct driver_info      *info = dev->driver_info;
+       const struct driver_info *info = dev->driver_info;
        int                     retval, pm, mpn;
 
        clear_bit(EVENT_DEV_OPEN, &dev->flags);
@@ -865,7 +865,7 @@ int usbnet_open (struct net_device *net)
 {
        struct usbnet           *dev = netdev_priv(net);
        int                     retval;
-       struct driver_info      *info = dev->driver_info;
+       const struct driver_info *info = dev->driver_info;
 
        if ((retval = usb_autopm_get_interface(dev->intf)) < 0) {
                netif_info(dev, ifup, dev->net,
@@ -1205,7 +1205,7 @@ fail_lowmem:
        }
 
        if (test_bit (EVENT_LINK_RESET, &dev->flags)) {
-               struct driver_info      *info = dev->driver_info;
+               const struct driver_info *info = dev->driver_info;
                int                     retval = 0;
 
                clear_bit (EVENT_LINK_RESET, &dev->flags);
@@ -1353,7 +1353,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
        unsigned int                    length;
        struct urb              *urb = NULL;
        struct skb_data         *entry;
-       struct driver_info      *info = dev->driver_info;
+       const struct driver_info *info = dev->driver_info;
        unsigned long           flags;
        int retval;
 
@@ -1647,7 +1647,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
        struct usbnet                   *dev;
        struct net_device               *net;
        struct usb_host_interface       *interface;
-       struct driver_info              *info;
+       const struct driver_info        *info;
        struct usb_device               *xdev;
        int                             status;
        const char                      *name;
@@ -1663,7 +1663,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
        }
 
        name = udev->dev.driver->name;
-       info = (struct driver_info *) prod->driver_info;
+       info = (const struct driver_info *) prod->driver_info;
        if (!info) {
                dev_dbg (&udev->dev, "blacklisted by %s\n", name);
                return -ENODEV;

diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index e2ec3582e54937d3818afed3e253440fc23541a0..d8860f2d0976d1f66594a8ed502deb8135a15878 100644 (file)
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -28,7 +28,7 @@ struct usbnet {
        /* housekeeping */
        struct usb_device       *udev;
        struct usb_interface    *intf;
-       struct driver_info      *driver_info;
+       const struct driver_info *driver_info;
        const char              *driver_name;
        void                    *driver_priv;
        wait_queue_head_t       wait;