aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-06 09:30:56 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-07 14:22:22 -0500
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/stmicro
parent45122ca26ced7fae41049326a3797a73f961db2e (diff)
drivers/net: fix up function prototypes after __dev* removals
The __dev* removal patches for the network drivers ended up messing up the function prototypes for a bunch of drivers. This patch fixes all of them back up to be properly aligned. Bonus is that this almost removes 100 lines of code, always a nice surprise. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c2
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 5cf9eb6dd65f..064eaac9616f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -62,7 +62,7 @@ static void stmmac_default_data(void)
62 * to take "ownership" of the device or an error code(-ve no) otherwise. 62 * to take "ownership" of the device or an error code(-ve no) otherwise.
63 */ 63 */
64static int stmmac_pci_probe(struct pci_dev *pdev, 64static int stmmac_pci_probe(struct pci_dev *pdev,
65 const struct pci_device_id *id) 65 const struct pci_device_id *id)
66{ 66{
67 int ret = 0; 67 int ret = 0;
68 void __iomem *addr = NULL; 68 void __iomem *addr = NULL;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b77b913df116..b43d68b40e50 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -30,8 +30,8 @@
30 30
31#ifdef CONFIG_OF 31#ifdef CONFIG_OF
32static int stmmac_probe_config_dt(struct platform_device *pdev, 32static int stmmac_probe_config_dt(struct platform_device *pdev,
33 struct plat_stmmacenet_data *plat, 33 struct plat_stmmacenet_data *plat,
34 const char **mac) 34 const char **mac)
35{ 35{
36 struct device_node *np = pdev->dev.of_node; 36 struct device_node *np = pdev->dev.of_node;
37 37
@@ -60,8 +60,8 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
60} 60}
61#else 61#else
62static int stmmac_probe_config_dt(struct platform_device *pdev, 62static int stmmac_probe_config_dt(struct platform_device *pdev,
63 struct plat_stmmacenet_data *plat, 63 struct plat_stmmacenet_data *plat,
64 const char **mac) 64 const char **mac)
65{ 65{
66 return -ENOSYS; 66 return -ENOSYS;
67} 67}