11 files changed, 11 insertions, 83 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 9c326a50a3ee..99610f358c40 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3444,25 +3444,12 @@ static void bond_remove_proc_entry(struct bonding *bond)
  */
 static void bond_create_proc_dir(void)
 {
-        int len = strlen(DRV_NAME);
-
-        for (bond_proc_dir = init_net.proc_net->subdir; bond_proc_dir;
-             bond_proc_dir = bond_proc_dir->next) {
-                if ((bond_proc_dir->namelen == len) &&
-                    !memcmp(bond_proc_dir->name, DRV_NAME, len)) {
-                        break;
-                }
-        }
-
         if (!bond_proc_dir) {
                 bond_proc_dir = proc_mkdir(DRV_NAME, init_net.proc_net);
-                if (bond_proc_dir) {
-                        bond_proc_dir->owner = THIS_MODULE;
-                } else {
+                if (!bond_proc_dir)
                         printk(KERN_WARNING DRV_NAME
                                 ": Warning: cannot create /proc/net/%s\n",
                                 DRV_NAME);
-                }
         }
 }
 
@@ -3471,25 +3458,7 @@ static void bond_create_proc_dir(void)
  */
 static void bond_destroy_proc_dir(void)
 {
-        struct proc_dir_entry *de;
-
-        if (!bond_proc_dir) {
-                return;
-        }
-
-        /* verify that the /proc dir is empty */
-        for (de = bond_proc_dir->subdir; de; de = de->next) {
-                /* ignore . and .. */
-                if (*(de->name) != '.') {
-                        break;
-                }
-        }
-
-        if (de) {
-                if (bond_proc_dir->owner == THIS_MODULE) {
-                        bond_proc_dir->owner = NULL;
-                }
-        } else {
+        if (bond_proc_dir) {
                 remove_proc_entry(DRV_NAME, init_net.proc_net);
                 bond_proc_dir = NULL;
         }
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 254ec62b5f58..d8350860c0f8 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -559,7 +559,7 @@ static void dm9000_show_carrier(board_info_t *db,
 static void
 dm9000_poll_work(struct work_struct *w)
 {
-        struct delayed_work *dw = container_of(w, struct delayed_work, work);
+        struct delayed_work *dw = to_delayed_work(w);
         board_info_t *db = container_of(dw, board_info_t, phy_poll);
         struct net_device *ndev = db->ndev;
 
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 2d0a198882ab..8bbe7f617994 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -1134,9 +1134,9 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
 #endif
 
 static struct of_device_id mpc52xx_fec_match[] = {
-        { .type = "network", .compatible = "fsl,mpc5200b-fec", },
-        { .type = "network", .compatible = "fsl,mpc5200-fec", },
-        { .type = "network", .compatible = "mpc5200-fec", },
+        { .compatible = "fsl,mpc5200b-fec", },
+        { .compatible = "fsl,mpc5200-fec", },
+        { .compatible = "mpc5200-fec", },
         { }
 };
 
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 1243bc8e0035..ac0e4b6b6b66 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1871,13 +1871,6 @@ static int __init vlsi_mod_init(void)
          * without procfs - it's not required for the driver to work.
          */
         vlsi_proc_root = proc_mkdir(PROC_DIR, NULL);
-        if (vlsi_proc_root) {
-                /* protect registered procdir against module removal.
-                 * Because we are in the module init path there's no race
-                 * window after create_proc_entry (and no barrier needed).
-                 */
-                vlsi_proc_root->owner = THIS_MODULE;
-        }
 
         ret = pci_register_driver(&vlsi_irda_driver);
 
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index c336a1f42510..aa08987f6e81 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -398,7 +398,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
                         int len = (status & 0xffff) - 4; /* omit CRC */
                         /* length sanity check */
                         if (len < 60 || len > 1518) {
-                                printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2lx.\n",
+                                printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2Lx.\n",
                                        dev->name, priv->rx_write,
                                        priv->rx_ring[priv->rx_write]->status.raw);
                                 dev->stats.rx_errors++;
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 9f6644a44030..303c23de6cac 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -505,7 +505,7 @@ out:
 
 static void mlx4_en_do_get_stats(struct work_struct *work)
 {
-        struct delayed_work *delay = container_of(work, struct delayed_work, work);
+        struct delayed_work *delay = to_delayed_work(work);
         struct mlx4_en_priv *priv = container_of(delay, struct mlx4_en_priv,
                                                  stats_task);
         struct mlx4_en_dev *mdev = priv->mdev;
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index a4130e764991..7e40741fb7d8 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -298,7 +298,7 @@ static void mlx4_en_free_rx_buf(struct mlx4_en_priv *priv,
 
 void mlx4_en_rx_refill(struct work_struct *work)
 {
-        struct delayed_work *delay = container_of(work, struct delayed_work, work);
+        struct delayed_work *delay = to_delayed_work(work);
         struct mlx4_en_priv *priv = container_of(delay, struct mlx4_en_priv,
                                                  refill_task);
         struct mlx4_en_dev *mdev = priv->mdev;
diff --git a/drivers/net/mlx4/sense.c b/drivers/net/mlx4/sense.c
index 6d5089ecb5af..f36ae691cab3 100644
--- a/drivers/net/mlx4/sense.c
+++ b/drivers/net/mlx4/sense.c
@@ -103,7 +103,7 @@ void mlx4_do_sense_ports(struct mlx4_dev *dev,
 
 static void mlx4_sense_port(struct work_struct *work)
 {
-        struct delayed_work *delay = container_of(work, struct delayed_work, work);
+        struct delayed_work *delay = to_delayed_work(work);
         struct mlx4_sense *sense = container_of(delay, struct mlx4_sense,
                                                 sense_poll);
         struct mlx4_dev *dev = sense->dev;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 58b73b08dde0..3ff1f425f1bb 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -757,8 +757,7 @@ EXPORT_SYMBOL(phy_start);
  */
 static void phy_state_machine(struct work_struct *work)
 {
-        struct delayed_work *dwork =
-                        container_of(work, struct delayed_work, work);
+        struct delayed_work *dwork = to_delayed_work(work);
         struct phy_device *phydev =
                         container_of(dwork, struct phy_device, state_queue);
         int needs_aneg = 0;
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 6c44f86ae3fd..912308eec865 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -346,38 +346,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
 
-#elif defined(CONFIG_SOC_AU1X00)
-
-#include <au1xxx.h>
-
-/* We can only do 16-bit reads and writes in the static memory space. */
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_IO_SHIFT            0
-#define SMC_NOWAIT              1
-
-#define SMC_inw(a, r)           au_readw((unsigned long)((a) + (r)))
-#define SMC_insw(a, r, p, l)    \
-        do {    \
-                unsigned long _a = (unsigned long)((a) + (r)); \
-                int _l = (l); \
-                u16 *_p = (u16 *)(p); \
-                while (_l-- > 0) \
-                        *_p++ = au_readw(_a); \
-        } while(0)
-#define SMC_outw(v, a, r)       au_writew(v, (unsigned long)((a) + (r)))
-#define SMC_outsw(a, r, p, l)   \
-        do {    \
-                unsigned long _a = (unsigned long)((a) + (r)); \
-                int _l = (l); \
-                const u16 *_p = (const u16 *)(p); \
-                while (_l-- > 0) \
-                        au_writew(*_p++ , _a); \
-        } while(0)
-
-#define SMC_IRQ_FLAGS           (0)
-
 #elif   defined(CONFIG_ARCH_VERSATILE)
 
 #define SMC_CAN_USE_8BIT        1
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 93302c0a36b0..f21a6171c691 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -4492,7 +4492,6 @@ static int setup_proc_entry( struct net_device *dev,
                 goto fail;
         apriv->proc_entry->uid = proc_uid;
         apriv->proc_entry->gid = proc_gid;
-        apriv->proc_entry->owner = THIS_MODULE;
 
         /* Setup the StatsDelta */
         entry = proc_create_data("StatsDelta",