summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-04-18 17:39:24 -0700
committerGreg K-H <gregkh@suse.de>2005-04-18 17:39:24 -0700
commit6d5e8254bf488a40b7ae2faafbffa232ab19d541 (patch)
tree5b1da56cde518016bee4d94ba55da4f9231307f8
parentba9d35fb01852e195f2a4ca975fdcd6578b52c78 (diff)
[PATCH] USB: fix up some sparse warnings about static functions that aren't static.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Index: gregkh-2.6/drivers/usb/core/usb.h ===================================================================
-rw-r--r--drivers/usb/core/config.c3
-rw-r--r--drivers/usb/core/devices.c1
-rw-r--r--drivers/usb/core/file.c2
-rw-r--r--drivers/usb/core/inode.c1
-rw-r--r--drivers/usb/core/usb.c7
-rw-r--r--drivers/usb/core/usb.h8
6 files changed, 14 insertions, 8 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 0b092bdf98f..99595e07b65 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -10,7 +10,8 @@
#include <linux/slab.h>
#include <linux/device.h>
#include <asm/byteorder.h>
-
+#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 8b61bcd742c..b87608b7051 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -59,6 +59,7 @@
#include <linux/usbdevice_fs.h>
#include <asm/uaccess.h>
+#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 80ce9644d0e..38ed2220c9f 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -28,6 +28,8 @@
#endif
#include <linux/usb.h>
+#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 d913407bcdc..f9f9561c6ba 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -41,6 +41,7 @@
#include <linux/parser.h>
#include <asm/byteorder.h>
#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 5e45996b5a4..c231b4bef31 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 4c33eee5200..2c690f6d4c1 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;