Commit f3edc2db authored by Ben Dooks's avatar Ben Dooks Committed by David S. Miller

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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8873c064
...@@ -802,7 +802,7 @@ static void usbnet_terminate_urbs(struct usbnet *dev) ...@@ -802,7 +802,7 @@ static void usbnet_terminate_urbs(struct usbnet *dev)
int usbnet_stop (struct net_device *net) int usbnet_stop (struct net_device *net)
{ {
struct usbnet *dev = netdev_priv(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; int retval, pm, mpn;
clear_bit(EVENT_DEV_OPEN, &dev->flags); clear_bit(EVENT_DEV_OPEN, &dev->flags);
...@@ -865,7 +865,7 @@ int usbnet_open (struct net_device *net) ...@@ -865,7 +865,7 @@ int usbnet_open (struct net_device *net)
{ {
struct usbnet *dev = netdev_priv(net); struct usbnet *dev = netdev_priv(net);
int retval; 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) { if ((retval = usb_autopm_get_interface(dev->intf)) < 0) {
netif_info(dev, ifup, dev->net, netif_info(dev, ifup, dev->net,
...@@ -1205,7 +1205,7 @@ usbnet_deferred_kevent (struct work_struct *work) ...@@ -1205,7 +1205,7 @@ usbnet_deferred_kevent (struct work_struct *work)
} }
if (test_bit (EVENT_LINK_RESET, &dev->flags)) { 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; int retval = 0;
clear_bit (EVENT_LINK_RESET, &dev->flags); clear_bit (EVENT_LINK_RESET, &dev->flags);
...@@ -1353,7 +1353,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, ...@@ -1353,7 +1353,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
unsigned int length; unsigned int length;
struct urb *urb = NULL; struct urb *urb = NULL;
struct skb_data *entry; struct skb_data *entry;
struct driver_info *info = dev->driver_info; const struct driver_info *info = dev->driver_info;
unsigned long flags; unsigned long flags;
int retval; int retval;
...@@ -1647,7 +1647,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) ...@@ -1647,7 +1647,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
struct usbnet *dev; struct usbnet *dev;
struct net_device *net; struct net_device *net;
struct usb_host_interface *interface; struct usb_host_interface *interface;
struct driver_info *info; const struct driver_info *info;
struct usb_device *xdev; struct usb_device *xdev;
int status; int status;
const char *name; const char *name;
...@@ -1663,7 +1663,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) ...@@ -1663,7 +1663,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
} }
name = udev->dev.driver->name; name = udev->dev.driver->name;
info = (struct driver_info *) prod->driver_info; info = (const struct driver_info *) prod->driver_info;
if (!info) { if (!info) {
dev_dbg (&udev->dev, "blacklisted by %s\n", name); dev_dbg (&udev->dev, "blacklisted by %s\n", name);
return -ENODEV; return -ENODEV;
......
...@@ -28,7 +28,7 @@ struct usbnet { ...@@ -28,7 +28,7 @@ struct usbnet {
/* housekeeping */ /* housekeeping */
struct usb_device *udev; struct usb_device *udev;
struct usb_interface *intf; struct usb_interface *intf;
struct driver_info *driver_info; const struct driver_info *driver_info;
const char *driver_name; const char *driver_name;
void *driver_priv; void *driver_priv;
wait_queue_head_t wait; wait_queue_head_t wait;
......
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