diff options
-rw-r--r-- | drivers/usb/net/zd1201.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c index c81cd0a619bf..f98cb2af024e 100644 --- a/drivers/usb/net/zd1201.c +++ b/drivers/usb/net/zd1201.c | |||
@@ -45,7 +45,7 @@ MODULE_PARM_DESC(ap, "If non-zero Access Point firmware will be loaded"); | |||
45 | MODULE_DEVICE_TABLE(usb, zd1201_table); | 45 | MODULE_DEVICE_TABLE(usb, zd1201_table); |
46 | 46 | ||
47 | 47 | ||
48 | int zd1201_fw_upload(struct usb_device *dev, int apfw) | 48 | static int zd1201_fw_upload(struct usb_device *dev, int apfw) |
49 | { | 49 | { |
50 | const struct firmware *fw_entry; | 50 | const struct firmware *fw_entry; |
51 | char* data; | 51 | char* data; |
@@ -111,7 +111,7 @@ exit: | |||
111 | return err; | 111 | return err; |
112 | } | 112 | } |
113 | 113 | ||
114 | void zd1201_usbfree(struct urb *urb, struct pt_regs *regs) | 114 | static void zd1201_usbfree(struct urb *urb, struct pt_regs *regs) |
115 | { | 115 | { |
116 | struct zd1201 *zd = urb->context; | 116 | struct zd1201 *zd = urb->context; |
117 | 117 | ||
@@ -142,7 +142,8 @@ void zd1201_usbfree(struct urb *urb, struct pt_regs *regs) | |||
142 | 142 | ||
143 | total: 4 + 2 + 2 + 2 + 2 + 4 = 16 | 143 | total: 4 + 2 + 2 + 2 + 2 + 4 = 16 |
144 | */ | 144 | */ |
145 | int zd1201_docmd(struct zd1201 *zd, int cmd, int parm0, int parm1, int parm2) | 145 | static int zd1201_docmd(struct zd1201 *zd, int cmd, int parm0, |
146 | int parm1, int parm2) | ||
146 | { | 147 | { |
147 | unsigned char *command; | 148 | unsigned char *command; |
148 | int ret; | 149 | int ret; |
@@ -175,7 +176,7 @@ int zd1201_docmd(struct zd1201 *zd, int cmd, int parm0, int parm1, int parm2) | |||
175 | } | 176 | } |
176 | 177 | ||
177 | /* Callback after sending out a packet */ | 178 | /* Callback after sending out a packet */ |
178 | void zd1201_usbtx(struct urb *urb, struct pt_regs *regs) | 179 | static void zd1201_usbtx(struct urb *urb, struct pt_regs *regs) |
179 | { | 180 | { |
180 | struct zd1201 *zd = urb->context; | 181 | struct zd1201 *zd = urb->context; |
181 | netif_wake_queue(zd->dev); | 182 | netif_wake_queue(zd->dev); |
@@ -183,7 +184,7 @@ void zd1201_usbtx(struct urb *urb, struct pt_regs *regs) | |||
183 | } | 184 | } |
184 | 185 | ||
185 | /* Incomming data */ | 186 | /* Incomming data */ |
186 | void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) | 187 | static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) |
187 | { | 188 | { |
188 | struct zd1201 *zd = urb->context; | 189 | struct zd1201 *zd = urb->context; |
189 | int free = 0; | 190 | int free = 0; |
@@ -613,7 +614,7 @@ static inline int zd1201_setconfig16(struct zd1201 *zd, int rid, short val) | |||
613 | return (zd1201_setconfig(zd, rid, &zdval, sizeof(__le16), 1)); | 614 | return (zd1201_setconfig(zd, rid, &zdval, sizeof(__le16), 1)); |
614 | } | 615 | } |
615 | 616 | ||
616 | int zd1201_drvr_start(struct zd1201 *zd) | 617 | static int zd1201_drvr_start(struct zd1201 *zd) |
617 | { | 618 | { |
618 | int err, i; | 619 | int err, i; |
619 | short max; | 620 | short max; |
@@ -1739,7 +1740,8 @@ static const struct iw_handler_def zd1201_iw_handlers = { | |||
1739 | .private_args = (struct iw_priv_args *) zd1201_private_args, | 1740 | .private_args = (struct iw_priv_args *) zd1201_private_args, |
1740 | }; | 1741 | }; |
1741 | 1742 | ||
1742 | int zd1201_probe(struct usb_interface *interface, const struct usb_device_id *id) | 1743 | static int zd1201_probe(struct usb_interface *interface, |
1744 | const struct usb_device_id *id) | ||
1743 | { | 1745 | { |
1744 | struct zd1201 *zd; | 1746 | struct zd1201 *zd; |
1745 | struct usb_device *usb; | 1747 | struct usb_device *usb; |
@@ -1851,7 +1853,7 @@ err_zd: | |||
1851 | return err; | 1853 | return err; |
1852 | } | 1854 | } |
1853 | 1855 | ||
1854 | void zd1201_disconnect(struct usb_interface *interface) | 1856 | static void zd1201_disconnect(struct usb_interface *interface) |
1855 | { | 1857 | { |
1856 | struct zd1201 *zd=(struct zd1201 *)usb_get_intfdata(interface); | 1858 | struct zd1201 *zd=(struct zd1201 *)usb_get_intfdata(interface); |
1857 | struct hlist_node *node, *node2; | 1859 | struct hlist_node *node, *node2; |
@@ -1882,7 +1884,7 @@ void zd1201_disconnect(struct usb_interface *interface) | |||
1882 | kfree(zd); | 1884 | kfree(zd); |
1883 | } | 1885 | } |
1884 | 1886 | ||
1885 | struct usb_driver zd1201_usb = { | 1887 | static struct usb_driver zd1201_usb = { |
1886 | .owner = THIS_MODULE, | 1888 | .owner = THIS_MODULE, |
1887 | .name = "zd1201", | 1889 | .name = "zd1201", |
1888 | .probe = zd1201_probe, | 1890 | .probe = zd1201_probe, |