5 files changed, 16 insertions, 16 deletions

diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c
index e62c31234cfa..07a6ebc47c92 100644
--- a/drivers/net/ethernet/micrel/ks8695net.c
+++ b/drivers/net/ethernet/micrel/ks8695net.c
@@ -1274,7 +1274,7 @@ ks8695_open(struct net_device *ndev)
  *      This initialises the LAN switch in the KS8695 to a known-good
  *      set of defaults.
  */
-static void __devinit
+static void
 ks8695_init_switch(struct ks8695_priv *ksp)
 {
         u32 ctrl;
@@ -1302,7 +1302,7 @@ ks8695_init_switch(struct ks8695_priv *ksp)
  *      This initialises a KS8695's WAN phy to sensible values for
  *      autonegotiation etc.
  */
-static void __devinit
+static void
 ks8695_init_wan_phy(struct ks8695_priv *ksp)
 {
         u32 ctrl;
@@ -1346,7 +1346,7 @@ static const struct net_device_ops ks8695_netdev_ops = {
  *      wan ports, and an IORESOURCE_IRQ for the link IRQ for the wan
  *      port.
  */
-static int __devinit
+static int
 ks8695_probe(struct platform_device *pdev)
 {
         struct ks8695_priv *ksp;
@@ -1594,7 +1594,7 @@ ks8695_drv_resume(struct platform_device *pdev)
  *
  *      This unregisters and releases a KS8695 ethernet device.
  */
-static int __devexit
+static int
 ks8695_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
@@ -1617,7 +1617,7 @@ static struct platform_driver ks8695_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ks8695_probe,
-        .remove         = __devexit_p(ks8695_drv_remove),
+        .remove         = ks8695_drv_remove,
         .suspend        = ks8695_drv_suspend,
         .resume         = ks8695_drv_resume,
 };
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 24fb049ac2f2..b71eb39ab448 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -1141,7 +1141,7 @@ static const struct ethtool_ops ks8842_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
 };
 
-static int __devinit ks8842_probe(struct platform_device *pdev)
+static int ks8842_probe(struct platform_device *pdev)
 {
         int err = -ENOMEM;
         struct resource *iomem;
@@ -1240,7 +1240,7 @@ err_mem_region:
         return err;
 }
 
-static int __devexit ks8842_remove(struct platform_device *pdev)
+static int ks8842_remove(struct platform_device *pdev)
 {
         struct net_device *netdev = platform_get_drvdata(pdev);
         struct ks8842_adapter *adapter = netdev_priv(netdev);
@@ -1262,7 +1262,7 @@ static struct platform_driver ks8842_platform_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ks8842_probe,
-        .remove         = __devexit_p(ks8842_remove),
+        .remove         = ks8842_remove,
 };
 
 module_platform_driver(ks8842_platform_driver);
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 1540ebeb8669..286816a4e783 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1415,7 +1415,7 @@ static int ks8851_resume(struct spi_device *spi)
 #define ks8851_resume NULL
 #endif
 
-static int __devinit ks8851_probe(struct spi_device *spi)
+static int ks8851_probe(struct spi_device *spi)
 {
         struct net_device *ndev;
         struct ks8851_net *ks;
@@ -1534,7 +1534,7 @@ err_irq:
         return ret;
 }
 
-static int __devexit ks8851_remove(struct spi_device *spi)
+static int ks8851_remove(struct spi_device *spi)
 {
         struct ks8851_net *priv = dev_get_drvdata(&spi->dev);
 
@@ -1554,7 +1554,7 @@ static struct spi_driver ks8851_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ks8851_probe,
-        .remove = __devexit_p(ks8851_remove),
+        .remove = ks8851_remove,
         .suspend = ks8851_suspend,
         .resume = ks8851_resume,
 };
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 38529edfe350..ef8f9f92e547 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1506,7 +1506,7 @@ static int ks_hw_init(struct ks_net *ks)
 }
 
 
-static int __devinit ks8851_probe(struct platform_device *pdev)
+static int ks8851_probe(struct platform_device *pdev)
 {
         int err = -ENOMEM;
         struct resource *io_d, *io_c;
@@ -1641,7 +1641,7 @@ err_mem_region:
         return err;
 }
 
-static int __devexit ks8851_remove(struct platform_device *pdev)
+static int ks8851_remove(struct platform_device *pdev)
 {
         struct net_device *netdev = platform_get_drvdata(pdev);
         struct ks_net *ks = netdev_priv(netdev);
@@ -1663,7 +1663,7 @@ static struct platform_driver ks8851_platform_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ks8851_probe,
-        .remove = __devexit_p(ks8851_remove),
+        .remove = ks8851_remove,
 };
 
 module_platform_driver(ks8851_platform_driver);
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index d16ef24e622f..f3f09b18a707 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -1487,7 +1487,7 @@ struct dev_priv {
 #define DRV_VERSION             "1.0.0"
 #define DRV_RELDATE             "Feb 8, 2010"
 
-static char version[] __devinitdata =
+static char version[] =
         "Micrel " DEVICE_NAME " " DRV_VERSION " (" DRV_RELDATE ")";
 
 static u8 DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x88, 0x42, 0x01 };
@@ -6919,7 +6919,7 @@ static void read_other_addr(struct ksz_hw *hw)
 #define PCI_VENDOR_ID_MICREL_KS         0x16c6
 #endif
 
-static int __devinit pcidev_init(struct pci_dev *pdev,
+static int pcidev_init(struct pci_dev *pdev,
         const struct pci_device_id *id)
 {
         struct net_device *dev;