Merge commit 'origin/master' into next

9 files changed, 29 insertions, 29 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 01f282cd0989..892a9e4e275f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2206,7 +2206,7 @@ config SKGE_DEBUG
        depends on SKGE && DEBUG_FS
        help
          This option adds the ability to dump driver state for debugging.
-         The file debugfs/skge/ethX displays the state of the internal
+         The file /sys/kernel/debug/skge/ethX displays the state of the internal
          transmit and receive rings.
 
          If unsure, say N.
@@ -2232,7 +2232,7 @@ config SKY2_DEBUG
        depends on SKY2 && DEBUG_FS
        help
          This option adds the ability to dump driver state for debugging.
-         The file debugfs/sky2/ethX displays the state of the internal
+         The file /sys/kernel/debug/sky2/ethX displays the state of the internal
          transmit and receive rings.
 
          If unsure, say N.
@@ -2272,8 +2272,9 @@ config BNX2
 
 config CNIC
         tristate "Broadcom CNIC support"
-        depends on BNX2
-        depends on UIO
+        depends on PCI
+        select BNX2
+        select UIO
         help
           This driver supports offload features of Broadcom NetXtremeII
           gigabit Ethernet cards.
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 811d3517fce0..11a0ba47b677 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1366,6 +1366,7 @@ static const struct file_operations tun_fops = {
 static struct miscdevice tun_miscdev = {
         .minor = TUN_MINOR,
         .name = "tun",
+        .devnode = "net/tun",
         .fops = &tun_fops,
 };
 
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index 1fe5da4cf0a0..60330f313f27 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -432,7 +432,7 @@ struct i2400m {
         unsigned ready:1;               /* all probing steps done */
         unsigned rx_reorder:1;          /* RX reorder is enabled */
         u8 trace_msg_from_user;         /* echo rx msgs to 'trace' pipe */
-                                        /* typed u8 so debugfs/u8 can tweak */
+                                        /* typed u8 so /sys/kernel/debug/u8 can tweak */
         enum i2400m_system_state state;
         wait_queue_head_t state_wq;     /* Woken up when on state updates */
 
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index 509b6f94f73b..daf0c83527d8 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -28,11 +28,10 @@ config ATH5K_DEBUG
           Say Y, if and you will get debug options for ath5k.
           To use this, you need to mount debugfs:
 
-          mkdir /debug/
-          mount -t debugfs debug /debug/
+          mount -t debugfs debug /sys/kernel/debug
 
           You will get access to files under:
-          /debug/ath5k/phy0/
+          /sys/kernel/debug/ath5k/phy0/
 
           To enable debug, pass the debug level to the debug module
           parameter. For example:
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index d860fc375752..ab6a2d518af0 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -72,7 +72,7 @@ rdrf
         location that is to be read.  This parameter must be specified in
         hexadecimal (its possible to preceed preceding the number with a "0x").
 
-        Path: /debugfs/libertas_wireless/ethX/registers/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/registers/
 
         Usage:
                 echo "0xa123" > rdmac ; cat rdmac
@@ -95,7 +95,7 @@ wrrf
 sleepparams
         This command is used to set the sleepclock configurations
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
         Usage:
                 cat sleepparams: reads the current sleepclock configuration
@@ -115,7 +115,7 @@ subscribed_events
         The subscribed_events directory contains the interface for the
         subscribed events API.
 
-        Path: /debugfs/libertas_wireless/ethX/subscribed_events/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/subscribed_events/
 
         Each event is represented by a filename. Each filename consists of the
         following three fields:
@@ -165,7 +165,7 @@ subscribed_events
 extscan
         This command is used to do a specific scan.
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
         Usage: echo "SSID" > extscan
 
@@ -179,7 +179,7 @@ getscantable
         Display the current contents of the driver scan table (ie. get the
         scan results).
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
         Usage:
                 cat getscantable
@@ -188,7 +188,7 @@ setuserscan
         Initiate a customized scan and retrieve the results
 
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
     Usage:
        echo "[ARGS]" > setuserscan
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index f8c2898d82b0..06a46d7b3d6c 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -43,8 +43,8 @@ struct if_spi_card {
         struct lbs_private              *priv;
         struct libertas_spi_platform_data *pdata;
 
-        char                            helper_fw_name[FIRMWARE_NAME_MAX];
-        char                            main_fw_name[FIRMWARE_NAME_MAX];
+        char                            helper_fw_name[IF_SPI_FW_NAME_MAX];
+        char                            main_fw_name[IF_SPI_FW_NAME_MAX];
 
         /* The card ID and card revision, as reported by the hardware. */
         u16                             card_id;
@@ -1019,9 +1019,9 @@ static int if_spi_calculate_fw_names(u16 card_id,
                 lbs_pr_err("Unsupported chip_id: 0x%02x\n", card_id);
                 return -EAFNOSUPPORT;
         }
-        snprintf(helper_fw, FIRMWARE_NAME_MAX, "libertas/gspi%d_hlp.bin",
+        snprintf(helper_fw, IF_SPI_FW_NAME_MAX, "libertas/gspi%d_hlp.bin",
                  chip_id_to_device_name[i].name);
-        snprintf(main_fw, FIRMWARE_NAME_MAX, "libertas/gspi%d.bin",
+        snprintf(main_fw, IF_SPI_FW_NAME_MAX, "libertas/gspi%d.bin",
                  chip_id_to_device_name[i].name);
         return 0;
 }
diff --git a/drivers/net/wireless/libertas/if_spi.h b/drivers/net/wireless/libertas/if_spi.h
index 2103869cc5b0..f87eec410848 100644
--- a/drivers/net/wireless/libertas/if_spi.h
+++ b/drivers/net/wireless/libertas/if_spi.h
@@ -22,6 +22,9 @@
 #define IF_SPI_CMD_BUF_SIZE 2400
 
 /***************** Firmware *****************/
+
+#define IF_SPI_FW_NAME_MAX 30
+
 struct chip_ident {
         u16 chip_id;
         u16 name;
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index d649caebf08a..1844c5adf6e9 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -61,11 +61,9 @@ static ssize_t if_usb_firmware_set(struct device *dev,
 {
         struct lbs_private *priv = to_net_dev(dev)->ml_priv;
         struct if_usb_card *cardp = priv->card;
-        char fwname[FIRMWARE_NAME_MAX];
         int ret;
 
-        sscanf(buf, "%29s", fwname); /* FIRMWARE_NAME_MAX - 1 = 29 */
-        ret = if_usb_prog_firmware(cardp, fwname, BOOT_CMD_UPDATE_FW);
+        ret = if_usb_prog_firmware(cardp, buf, BOOT_CMD_UPDATE_FW);
         if (ret == 0)
                 return count;
 
@@ -88,11 +86,9 @@ static ssize_t if_usb_boot2_set(struct device *dev,
 {
         struct lbs_private *priv = to_net_dev(dev)->ml_priv;
         struct if_usb_card *cardp = priv->card;
-        char fwname[FIRMWARE_NAME_MAX];
         int ret;
 
-        sscanf(buf, "%29s", fwname); /* FIRMWARE_NAME_MAX - 1 = 29 */
-        ret = if_usb_prog_firmware(cardp, fwname, BOOT_CMD_UPDATE_BOOT2);
+        ret = if_usb_prog_firmware(cardp, buf, BOOT_CMD_UPDATE_BOOT2);
         if (ret == 0)
                 return count;
 
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f67325387902..8d88daeed0c6 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1212,7 +1212,7 @@ static int __devinit netfront_probe(struct xenbus_device *dev,
         }
 
         info = netdev_priv(netdev);
-        dev->dev.driver_data = info;
+        dev_set_drvdata(&dev->dev, info);
 
         err = register_netdev(info->netdev);
         if (err) {
@@ -1233,7 +1233,7 @@ static int __devinit netfront_probe(struct xenbus_device *dev,
 
  fail:
         free_netdev(netdev);
-        dev->dev.driver_data = NULL;
+        dev_set_drvdata(&dev->dev, NULL);
         return err;
 }
 
@@ -1275,7 +1275,7 @@ static void xennet_disconnect_backend(struct netfront_info *info)
  */
 static int netfront_resume(struct xenbus_device *dev)
 {
-        struct netfront_info *info = dev->dev.driver_data;
+        struct netfront_info *info = dev_get_drvdata(&dev->dev);
 
         dev_dbg(&dev->dev, "%s\n", dev->nodename);
 
@@ -1600,7 +1600,7 @@ static int xennet_connect(struct net_device *dev)
 static void backend_changed(struct xenbus_device *dev,
                             enum xenbus_state backend_state)
 {
-        struct netfront_info *np = dev->dev.driver_data;
+        struct netfront_info *np = dev_get_drvdata(&dev->dev);
         struct net_device *netdev = np->netdev;
 
         dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state));
@@ -1774,7 +1774,7 @@ static struct xenbus_device_id netfront_ids[] = {
 
 static int __devexit xennet_remove(struct xenbus_device *dev)
 {
-        struct netfront_info *info = dev->dev.driver_data;
+        struct netfront_info *info = dev_get_drvdata(&dev->dev);
 
         dev_dbg(&dev->dev, "%s\n", dev->nodename);