From: Greg KH Date: Tue, 19 Apr 2005 00:39:24 +0000 (-0700) Subject: [PATCH] USB: fix up some sparse warnings about static functions that aren't static. X-Git-Tag: v2.6.12-rc3~26^2~17 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d5e8254bf488a40b7ae2faafbffa232ab19d541;p=linux-2.6 [PATCH] USB: fix up some sparse warnings about static functions that aren't static. Signed-off-by: Greg Kroah-Hartman Index: gregkh-2.6/drivers/usb/core/usb.h =================================================================== --- diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 0b092bdf98..99595e07b6 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -10,7 +10,8 @@ #include #include #include - +#include "usb.h" +#include "hcd.h" #define USB_MAXALTSETTING 128 /* Hard limit */ #define USB_MAXENDPOINTS 30 /* Hard limit */ diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index 8b61bcd742..b87608b705 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c @@ -59,6 +59,7 @@ #include #include +#include "usb.h" #include "hcd.h" #define MAX_TOPO_LEVEL 6 diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index 80ce9644d0..38ed2220c9 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -28,6 +28,8 @@ #endif #include +#include "usb.h" + #define MAX_USB_MINORS 256 static struct file_operations *usb_minors[MAX_USB_MINORS]; static DEFINE_SPINLOCK(minor_lock); diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index d913407bcd..f9f9561c6b 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c @@ -41,6 +41,7 @@ #include #include #include "usb.h" +#include "hcd.h" static struct super_operations usbfs_ops; static struct file_operations default_file_operations; diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 5e45996b5a..c231b4bef3 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -50,13 +50,6 @@ #include "hcd.h" #include "usb.h" -extern int usb_hub_init(void); -extern void usb_hub_cleanup(void); -extern int usb_major_init(void); -extern void usb_major_cleanup(void); -extern int usb_host_init(void); -extern void usb_host_cleanup(void); - const char *usbcore_name = "usbcore"; diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 4c33eee520..2c690f6d4c 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -21,6 +21,13 @@ extern void usb_unlock_all_devices(void); extern void usb_kick_khubd(struct usb_device *dev); extern void usb_resume_root_hub(struct usb_device *dev); +extern int usb_hub_init(void); +extern void usb_hub_cleanup(void); +extern int usb_major_init(void); +extern void usb_major_cleanup(void); +extern int usb_host_init(void); +extern void usb_host_cleanup(void); + /* for labeling diagnostics */ extern const char *usbcore_name; @@ -30,6 +37,7 @@ extern struct file_operations usbfs_devices_fops; extern struct file_operations usbfs_device_file_operations; extern void usbfs_conn_disc_event(void); + struct dev_state { struct list_head list; /* state list */ struct usb_device *dev;