Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

15 files changed, 29 insertions, 27 deletions

diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index b96f3184c2e5..1f879b500d83 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -344,7 +344,7 @@ setup_asuscom(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 0f1db1f669b2..7cabc5a19492 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
                         err = pnp_activate_dev(pnp_avm_d);
                         if (err<0) {
                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                        __FUNCTION__, err);
+                                        __func__, err);
                                 return(0);
                         }
                         cs->hw.avm.cfg_reg =
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 2d670856d141..018bd293e580 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1088,7 +1088,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
                                 err = pnp_activate_dev(pnp_d);
                                 if (err<0) {
                                         printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                __FUNCTION__, err);
+                                                __func__, err);
                                         return(0);
                                 }
                                 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 2c3691fda300..aa29d1cf16af 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -937,7 +937,7 @@ setup_elsa_isapnp(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index f4a213877e35..d92e8d6c2ae2 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1417,7 +1417,7 @@ setup_hfcsx(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 98b0149bca68..8df889b0c1a9 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -905,7 +905,7 @@ rx_int_complete(struct urb *urb)
         if (status) {
                 printk(KERN_INFO
                        "HFC-S USB: %s error resubmitting URB fifo(%d)\n",
-                       __FUNCTION__, fifon);
+                       __func__, fifon);
         }
 }
 
@@ -1543,14 +1543,14 @@ hfc_usb_disconnect(struct usb_interface *intf)
                                 stop_isoc_chain(&context->fifos[i]);
                                 DBG(HFCUSB_DBG_INIT,
                                     "HFC-S USB: %s stopping ISOC chain Fifo(%i)",
-                                    __FUNCTION__, i);
+                                    __func__, i);
                         }
                 } else {
                         if (context->fifos[i].active > 0) {
                                 context->fifos[i].active = 0;
                                 DBG(HFCUSB_DBG_INIT,
                                     "HFC-S USB: %s unlinking URB for Fifo(%i)",
-                                    __FUNCTION__, i);
+                                    __func__, i);
                         }
                         usb_kill_urb(context->fifos[i].urb);
                         usb_free_urb(context->fifos[i].urb);
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 909d6709ec16..cf082665cc8b 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h
index ceafecdb1037..5ed3b1c44184 100644
--- a/drivers/isdn/hisax/hisax_debug.h
+++ b/drivers/isdn/hisax/hisax_debug.h
@@ -27,14 +27,14 @@
 
 #define DBG(level, format, arg...) do { \
 if (level & __debug_variable) \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 
 #define DBG_PACKET(level,data,count) \
-  if (level & __debug_variable) dump_packet(__FUNCTION__,data,count)
+  if (level & __debug_variable) dump_packet(__func__,data,count)
 
 #define DBG_SKB(level,skb) \
-  if ((level & __debug_variable) && skb) dump_packet(__FUNCTION__,skb->data,skb->len)
+  if ((level & __debug_variable) && skb) dump_packet(__func__,skb->data,skb->len)
 
 
 static void __attribute__((unused))
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 76043dedba5b..c0b4db2f8364 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -68,7 +68,7 @@ static struct pci_device_id fcpci_ids[] = {
 
 MODULE_DEVICE_TABLE(pci, fcpci_ids);
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static struct pnp_device_id fcpnp_ids[] __devinitdata = {
         { 
                 .id             = "AVM0900",
@@ -914,7 +914,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
         return retval;
 }
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 {
         struct fritz_adapter *adapter;
@@ -935,7 +935,7 @@ static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_i
         pnp_disable_dev(pdev);
         retval = pnp_activate_dev(pdev);
         if (retval < 0) {
-                printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __FUNCTION__,
+                printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __func__,
                         (char *)dev_id->driver_data, retval);
                 goto err_free;
         }
@@ -974,6 +974,8 @@ static struct pnp_driver fcpnp_driver = {
         .remove         = __devexit_p(fcpnp_remove),
         .id_table       = fcpnp_ids,
 };
+#else
+static struct pnp_driver fcpnp_driver;
 #endif
 
 static void __devexit fcpci_remove(struct pci_dev *pdev)
@@ -1001,7 +1003,7 @@ static int __init hisax_fcpcipnp_init(void)
         retval = pci_register_driver(&fcpci_driver);
         if (retval)
                 return retval;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
         retval = pnp_register_driver(&fcpnp_driver);
         if (retval < 0) {
                 pci_unregister_driver(&fcpci_driver);
@@ -1013,7 +1015,7 @@ static int __init hisax_fcpcipnp_init(void)
 
 static void __exit hisax_fcpcipnp_exit(void)
 {
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
         pnp_unregister_driver(&fcpnp_driver);
 #endif
         pci_unregister_driver(&fcpci_driver);
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 2d18d4f1e57e..a92bf0d2cab2 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -252,7 +252,7 @@ setup_ix1micro(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 421b8e6763d7..ef00633e1d2a 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -255,7 +255,7 @@ int __devinit setup_niccy(struct IsdnCard *card)
                         err = pnp_activate_dev(pnp_d);
                         if (err < 0) {
                                 printk(KERN_WARNING "%s: pnp_activate_dev "
-                                        "ret(%d)\n", __FUNCTION__, err);
+                                        "ret(%d)\n", __func__, err);
                                 return 0;
                         }
                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 95425f3d2220..a10dfa82c734 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -555,7 +555,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
                                 err = pnp_activate_dev(pnp_d);
                                 if (err<0) {
                                         printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                __FUNCTION__, err);
+                                                __func__, err);
                                         return(0);
                                 }
                                 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 04416bad611d..2044e7173ab4 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -218,13 +218,13 @@ enum {
 #define L1_EVENT_COUNT (EV_TIMER3 + 1)
 
 #define ERR(format, arg...) \
-printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #define WARN(format, arg...) \
-printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #define INFO(format, arg...) \
-printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #include "isdnhdlc.h"
 #include "fsm.h"
@@ -406,7 +406,7 @@ struct st5481_adapter {
 
 /*
  * Submit an URB with error reporting. This is a macro so
- * the __FUNCTION__ returns the caller function name.
+ * the __func__ returns the caller function name.
  */
 #define SUBMIT_URB(urb, mem_flags) \
 ({ \
@@ -470,7 +470,7 @@ extern int st5481_debug;
 #ifdef CONFIG_HISAX_DEBUG
 
 #define DBG_ISO_PACKET(level,urb) \
-  if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb)
+  if (level & __debug_variable) dump_iso_packet(__func__,urb)
 
 static void __attribute__((unused))
 dump_iso_packet(const char *name, struct urb *urb)
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 4ada66b8b679..427a8b0520f5 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -342,7 +342,7 @@ void st5481_release_usb(struct st5481_adapter *adapter)
         usb_kill_urb(intr->urb);
         kfree(intr->urb->transfer_buffer);
         usb_free_urb(intr->urb);
-        ctrl->urb = NULL;
+        intr->urb = NULL;
 }
 
 /*
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 6a5e379e0774..5dc9f1a43629 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -301,7 +301,7 @@ setup_teles3(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[3] = pnp_port_start(pnp_d, 2);