6 files changed, 10 insertions, 99 deletions

diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 516751754aa9..9256985cbe36 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -157,9 +157,10 @@ static void bcm203x_complete(struct urb *urb)
         }
 }
 
-static void bcm203x_work(void *user_data)
+static void bcm203x_work(struct work_struct *work)
 {
-        struct bcm203x_data *data = user_data;
+        struct bcm203x_data *data =
+                container_of(work, struct bcm203x_data, work);
 
         if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)
                 BT_ERR("Can't submit URB");
@@ -246,7 +247,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
 
         release_firmware(firmware);
 
-        INIT_WORK(&data->work, bcm203x_work, (void *) data);
+        INIT_WORK(&data->work, bcm203x_work);
 
         usb_set_intfdata(intf, data);
 
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index cbc07250b898..acfb6a430dcc 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -892,43 +892,10 @@ static void bluecard_detach(struct pcmcia_device *link)
 }
 
 
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
-{
-        int i;
-
-        i = pcmcia_get_first_tuple(handle, tuple);
-        if (i != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-
-        i = pcmcia_get_tuple_data(handle, tuple);
-        if (i != CS_SUCCESS)
-                return i;
-
-        return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
 static int bluecard_config(struct pcmcia_device *link)
 {
         bluecard_info_t *info = link->priv;
-        tuple_t tuple;
-        u_short buf[256];
-        cisparse_t parse;
-        int i, n, last_ret, last_fn;
-
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-
-        /* Get configuration register information */
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(link, &tuple, &parse);
-        if (last_ret != CS_SUCCESS) {
-                last_fn = ParseTuple;
-                goto cs_failed;
-        }
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
+        int i, n;
 
         link->conf.ConfigIndex = 0x20;
         link->io.NumPorts1 = 64;
@@ -966,9 +933,6 @@ static int bluecard_config(struct pcmcia_device *link)
 
         return 0;
 
-cs_failed:
-        cs_error(link, last_fn, last_ret);
-
 failed:
         bluecard_release(link);
         return -ENODEV;
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 3a96a0babc6a..aae3abace586 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -713,22 +713,7 @@ static int bt3c_config(struct pcmcia_device *link)
         u_short buf[256];
         cisparse_t parse;
         cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        int i, j, try, last_ret, last_fn;
-
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-
-        /* Get configuration register information */
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(link, &tuple, &parse);
-        if (last_ret != CS_SUCCESS) {
-                last_fn = ParseTuple;
-                goto cs_failed;
-        }
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
+        int i, j, try;
 
         /* First pass: look for a config entry that looks normal. */
         tuple.TupleData = (cisdata_t *)buf;
@@ -802,9 +787,6 @@ found_port:
 
         return 0;
 
-cs_failed:
-        cs_error(link, last_fn, last_ret);
-
 failed:
         bt3c_release(link);
         return -ENODEV;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 3b29086b7c3f..92648ef2f5d0 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -644,22 +644,7 @@ static int btuart_config(struct pcmcia_device *link)
         u_short buf[256];
         cisparse_t parse;
         cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        int i, j, try, last_ret, last_fn;
-
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-
-        /* Get configuration register information */
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(link, &tuple, &parse);
-        if (last_ret != CS_SUCCESS) {
-                last_fn = ParseTuple;
-                goto cs_failed;
-        }
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
+        int i, j, try;
 
         /* First pass: look for a config entry that looks normal. */
         tuple.TupleData = (cisdata_t *) buf;
@@ -734,9 +719,6 @@ found_port:
 
         return 0;
 
-cs_failed:
-        cs_error(link, last_fn, last_ret);
-
 failed:
         btuart_release(link);
         return -ENODEV;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 07eafbc5dc3a..77b99eecbc49 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -626,22 +626,7 @@ static int dtl1_config(struct pcmcia_device *link)
         u_short buf[256];
         cisparse_t parse;
         cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        int i, last_ret, last_fn;
-
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-
-        /* Get configuration register information */
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(link, &tuple, &parse);
-        if (last_ret != CS_SUCCESS) {
-                last_fn = ParseTuple;
-                goto cs_failed;
-        }
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
+        int i;
 
         tuple.TupleData = (cisdata_t *)buf;
         tuple.TupleOffset = 0;
@@ -690,9 +675,6 @@ static int dtl1_config(struct pcmcia_device *link)
 
         return 0;
 
-cs_failed:
-        cs_error(link, last_fn, last_ret);
-
 failed:
         dtl1_release(link);
         return -ENODEV;
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index d0cface535fb..5e2c31882003 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -330,7 +330,7 @@ static struct sk_buff *bcsp_dequeue(struct hci_uart *hu)
            reliable packet if the number of packets sent but not yet ack'ed
            is < than the winsize */
 
-        spin_lock_irqsave(&bcsp->unack.lock, flags);
+        spin_lock_irqsave_nested(&bcsp->unack.lock, flags, SINGLE_DEPTH_NESTING);
 
         if (bcsp->unack.qlen < BCSP_TXWINSIZE && (skb = skb_dequeue(&bcsp->rel)) != NULL) {
                 struct sk_buff *nskb = bcsp_prepare_pkt(bcsp, skb->data, skb->len, bt_cb(skb)->pkt_type);
@@ -696,7 +696,7 @@ static void bcsp_timed_event(unsigned long arg)
 
         BT_DBG("hu %p retransmitting %u pkts", hu, bcsp->unack.qlen);
 
-        spin_lock_irqsave(&bcsp->unack.lock, flags);
+        spin_lock_irqsave_nested(&bcsp->unack.lock, flags, SINGLE_DEPTH_NESTING);
 
         while ((skb = __skb_dequeue_tail(&bcsp->unack)) != NULL) {
                 bcsp->msgq_txseq = (bcsp->msgq_txseq - 1) & 0x07;