This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / bluetooth / bluecard_cs.c

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 4db1fee..54ef5f9 100644 (file)
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -34,8 +34,6 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
-#include <linux/moduleparam.h>
-
 #include <linux/skbuff.h>
 #include <asm/io.h>
 
@@ -56,11 +54,11 @@
 
 
 /* Bit map of interrupts to choose from */
-static unsigned int irq_mask = 0x86bc;
+static u_int irq_mask = 0x86bc;
 static int irq_list[4] = { -1 };
 
-module_param(irq_mask, uint, 0);
-module_param_array(irq_list, int, NULL, 0);
+MODULE_PARM(irq_mask, "i");
+MODULE_PARM(irq_list, "1-4i");
 
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth driver for the Anycom BlueCard (LSE039/LSE041)");
@@ -92,14 +90,14 @@ typedef struct bluecard_info_t {
 } bluecard_info_t;
 
 
-static void bluecard_config(dev_link_t *link);
-static void bluecard_release(dev_link_t *link);
-static int bluecard_event(event_t event, int priority, event_callback_args_t *args);
+void bluecard_config(dev_link_t *link);
+void bluecard_release(dev_link_t *link);
+int bluecard_event(event_t event, int priority, event_callback_args_t *args);
 
 static dev_info_t dev_info = "bluecard_cs";
 
-static dev_link_t *bluecard_attach(void);
-static void bluecard_detach(dev_link_t *);
+dev_link_t *bluecard_attach(void);
+void bluecard_detach(dev_link_t *);
 
 static dev_link_t *dev_list = NULL;
 
@@ -172,7 +170,7 @@ static dev_link_t *dev_list = NULL;
 /* ======================== LED handling routines ======================== */
 
 
-static void bluecard_activity_led_timeout(u_long arg)
+void bluecard_activity_led_timeout(u_long arg)
 {
        bluecard_info_t *info = (bluecard_info_t *)arg;
        unsigned int iobase = info->link.io.BasePort1;
@@ -721,7 +719,7 @@ static int bluecard_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned l
 /* ======================== Card services HCI interaction ======================== */
 
 
-static int bluecard_open(bluecard_info_t *info)
+int bluecard_open(bluecard_info_t *info)
 {
        unsigned int iobase = info->link.io.BasePort1;
        struct hci_dev *hdev;
@@ -839,7 +837,7 @@ static int bluecard_open(bluecard_info_t *info)
 }
 
 
-static int bluecard_close(bluecard_info_t *info)
+int bluecard_close(bluecard_info_t *info)
 {
        unsigned int iobase = info->link.io.BasePort1;
        struct hci_dev *hdev = info->hdev;
@@ -866,7 +864,7 @@ static int bluecard_close(bluecard_info_t *info)
        return 0;
 }
 
-static dev_link_t *bluecard_attach(void)
+dev_link_t *bluecard_attach(void)
 {
        bluecard_info_t *info;
        client_reg_t client_reg;
@@ -924,7 +922,7 @@ static dev_link_t *bluecard_attach(void)
 }
 
 
-static void bluecard_detach(dev_link_t *link)
+void bluecard_detach(dev_link_t *link)
 {
        bluecard_info_t *info = link->priv;
        dev_link_t **linkp;
@@ -969,7 +967,7 @@ static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse
        return pcmcia_parse_tuple(handle, tuple, parse);
 }
 
-static void bluecard_config(dev_link_t *link)
+void bluecard_config(dev_link_t *link)
 {
        client_handle_t handle = link->handle;
        bluecard_info_t *info = link->priv;
@@ -1044,7 +1042,7 @@ failed:
 }
 
 
-static void bluecard_release(dev_link_t *link)
+void bluecard_release(dev_link_t *link)
 {
        bluecard_info_t *info = link->priv;
 
@@ -1063,7 +1061,7 @@ static void bluecard_release(dev_link_t *link)
 }
 
 
-static int bluecard_event(event_t event, int priority, event_callback_args_t *args)
+int bluecard_event(event_t event, int priority, event_callback_args_t *args)
 {
        dev_link_t *link = args->client_data;
        bluecard_info_t *info = link->priv;