Merge branch 'for-next/misc'

18 files changed, 24 insertions, 143 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bcf245dcdc..2736094b8b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -36,6 +36,7 @@ config DRIVER_NET_CS8900
 
 config DRIVER_NET_CPSW
 	bool "CPSW ethernet driver"
+	depends on ARCH_OMAP
 	select PHYLIB
 
 config DRIVER_NET_SMC911X
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index f0e907e78e..1a442781a9 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -557,12 +557,4 @@ static struct driver_d altera_tse_driver = {
 	.name = "altera_tse",
 	.probe = tse_probe,
 };
-
-static int tse_init(void)
-{
-	platform_driver_register(&altera_tse_driver);
-	return 0;
-}
-
-device_initcall(tse_init);
-
+device_platform_driver(altera_tse_driver);
diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c
index a0854dff52..dad78155fa 100644
--- a/drivers/net/at91_ether.c
+++ b/drivers/net/at91_ether.c
@@ -366,10 +366,4 @@ static struct driver_d at91_ether_driver = {
 	.probe = at91_ether_probe,
 	.remove = at91_ether_remove,
 };
-
-static int at91_ether_driver_init(void)
-{
-	platform_driver_register(&at91_ether_driver);
-	return 0;
-}
-device_initcall(at91_ether_driver_init);
+device_platform_driver(at91_ether_driver);
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 58c097afe4..e51a8b1b6e 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -1061,10 +1061,4 @@ static struct driver_d cpsw_driver = {
 	.name   = "cpsw",
 	.probe  = cpsw_probe,
 };
-
-static int cpsw_register(void)
-{
-	return platform_driver_register(&cpsw_driver);
-}
-
-device_initcall(cpsw_register);
+device_platform_driver(cpsw_driver);
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index b1ef3902c4..b0d045a4e9 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -468,11 +468,4 @@ static struct driver_d cs8900_driver = {
 	.probe = cs8900_probe,
 	.info = cs8900_info,
 };
-
-static int cs8900_init(void)
-{
-	platform_driver_register(&cs8900_driver);
-	return 0;
-}
-
-device_initcall(cs8900_init);
+device_platform_driver(cs8900_driver);
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 989e119c38..7848f50b9b 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -608,11 +608,4 @@ static struct driver_d davinci_emac_driver = {
 	.probe  = davinci_emac_probe,
 	.remove = davinci_emac_remove,
 };
-
-static int davinci_emac_register(void)
-{
-	platform_driver_register(&davinci_emac_driver);
-	return 0;
-}
-
-device_initcall(davinci_emac_register);
+device_platform_driver(davinci_emac_driver);
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index f803e6693a..a6b32b9b2e 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -455,10 +455,4 @@ static struct driver_d dwc_ether_driver = {
 	.probe = dwc_ether_probe,
 	.remove = dwc_ether_remove,
 };
-
-static int dwc_ether_driver_init(void)
-{
-	platform_driver_register(&dwc_ether_driver);
-	return 0;
-}
-device_initcall(dwc_ether_driver_init);
+device_platform_driver(dwc_ether_driver);
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index 8be0f16646..090482c0ad 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -780,11 +780,4 @@ static struct driver_d dm9k_driver = {
 	.name  = "dm9000",
 	.probe = dm9k_probe,
 };
-
-static int dm9k_init(void)
-{
-	platform_driver_register(&dm9k_driver);
-	return 0;
-}
-
-device_initcall(dm9k_init);
+device_platform_driver(dm9k_driver);
diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c
index 37c9f0a81e..1ecef13394 100644
--- a/drivers/net/ep93xx.c
+++ b/drivers/net/ep93xx.c
@@ -663,11 +663,4 @@ static struct driver_d ep93xx_eth_driver = {
 	.name  = "ep93xx_eth",
 	.probe = ep93xx_eth_probe,
 };
-
-static int ep93xx_eth_init(void)
-{
-	platform_driver_register(&ep93xx_eth_driver);
-	return 0;
-}
-
-device_initcall(ep93xx_eth_init);
+device_platform_driver(ep93xx_eth_driver);
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 1767ef8bc0..578000ac1b 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -779,14 +779,7 @@ static struct driver_d fec_driver = {
 	.of_compatible = DRV_OF_COMPAT(imx_fec_dt_ids),
 	.id_table = imx_fec_ids,
 };
-
-static int fec_register(void)
-{
-	platform_driver_register(&fec_driver);
-	return 0;
-}
-
-device_initcall(fec_register);
+device_platform_driver(fec_driver);
 
 /**
  * @file
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index a14c8d1c4f..9ef5350aaf 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -717,12 +717,4 @@ static struct driver_d mpc5xxx_driver = {
         .probe = mpc5xxx_fec_probe,
 	.remove = mpc5xxx_fec_remove,
 };
-
-static int mpc5xxx_fec_register(void)
-{
-        platform_driver_register(&mpc5xxx_driver);
-        return 0;
-}
-
-device_initcall(mpc5xxx_fec_register);
-
+device_platform_driver(mpc5xxx_driver);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 55675baea6..96055bd39c 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -528,11 +528,4 @@ static struct driver_d gfar_eth_driver = {
 	.name  = "gfar",
 	.probe = gfar_probe,
 };
-
-static int gfar_eth_init(void)
-{
-	platform_driver_register(&gfar_eth_driver);
-	return 0;
-}
-
-device_initcall(gfar_eth_init);
+device_platform_driver(gfar_eth_driver);
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 79b88f216a..9c0e5a7a10 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -873,11 +873,4 @@ static struct driver_d ks8851_driver = {
 	.name  = "ks8851_mll",
 	.probe = ks8851_probe,
 };
-
-static int ks8851_init(void)
-{
-	platform_driver_register(&ks8851_driver);
-	return 0;
-}
-
-device_initcall(ks8851_init);
+device_platform_driver(ks8851_driver);
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 0cfad05406..8602437a09 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -666,11 +666,4 @@ static struct driver_d macb_driver = {
 	.name  = "macb",
 	.probe = macb_probe,
 };
-
-static int macb_driver_init(void)
-{
-	debug("%s\n", __func__);
-	platform_driver_register(&macb_driver);
-	return 0;
-}
-device_initcall(macb_driver_init);
+device_platform_driver(macb_driver);
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index e2b5591d25..9ca9bce1f8 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -276,12 +276,4 @@ static struct driver_d netx_eth_driver = {
         .name  = "netx-eth",
         .probe = netx_eth_probe,
 };
-
-static int netx_eth_init(void)
-{
-        platform_driver_register(&netx_eth_driver);
-        return 0;
-}
-
-device_initcall(netx_eth_init);
-
+device_platform_driver(netx_eth_driver);
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index ac978d91dc..48183dd4fa 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -935,7 +935,7 @@ static int smc91c111_eth_send(struct eth_device *edev, void *packet,
 
 	if (numPages > 7) {
 		printf ("%s: Far too big packet error. \n", SMC_DEV_NAME);
-		return 0;
+		return -EOVERFLOW;
 	}
 
 	/* now, try to allocate the memory */
@@ -965,7 +965,7 @@ again:
 		if (try < SMC_ALLOC_MAX_TRY)
 			goto again;
 		else
-			return 0;
+			return -ETIMEDOUT;
 	}
 
 	PRINTK2 ("%s: memory allocation, try %d succeeded ...\n",
@@ -980,7 +980,7 @@ again:
 	if (packet_no & AR_FAILED) {
 		/* or isn't there?  BAD CHIP! */
 		printf ("%s: Memory allocation failed. \n", SMC_DEV_NAME);
-		return 0;
+		return -ENOMEM;
 	}
 
 	/* we have a packet address, so tell the card to use it */
@@ -1046,7 +1046,7 @@ again:
 	SMC_outb(priv, saved_pnr, PN_REG );
 	SMC_outw(priv, saved_ptr, PTR_REG );
 
-	return length;
+	return 0;
 }
 
 static void smc91c111_eth_halt(struct eth_device *edev)
@@ -1152,10 +1152,10 @@ static int smc91c111_eth_rx(struct eth_device *edev)
 	if (!is_error) {
 		/* Pass the packet up to the protocol layers. */
 		net_receive(NetRxPackets[0], packet_length);
-		return packet_length;
+		return 0;
 	}
 
-	return 0;
+	return -EINVAL;
 }
 
 static int smc91c111_get_ethaddr(struct eth_device *edev, unsigned char *m)
@@ -1319,11 +1319,4 @@ static struct driver_d smc91c111_driver = {
         .name  = "smc91c111",
         .probe = smc91c111_probe,
 };
-
-static int smc91c111_init(void)
-{
-        platform_driver_register(&smc91c111_driver);
-        return 0;
-}
-
-device_initcall(smc91c111_init);
+device_platform_driver(smc91c111_driver);
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 28c69ba872..3b94779cd9 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -638,12 +638,4 @@ static struct driver_d smc911x_driver = {
         .name  = "smc911x",
         .probe = smc911x_probe,
 };
-
-static int smc911x_init(void)
-{
-        platform_driver_register(&smc911x_driver);
-        return 0;
-}
-
-device_initcall(smc911x_init);
-
+device_platform_driver(smc911x_driver);
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 1cf4e1861b..436b0e085a 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -109,11 +109,4 @@ static struct driver_d tap_driver = {
         .name  = "tap",
         .probe = tap_probe,
 };
-
-static int tap_init(void)
-{
-        platform_driver_register(&tap_driver);
-        return 0;
-}
-
-device_initcall(tap_init);
+device_platform_driver(tap_driver);