diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-06 09:30:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 14:22:22 -0500 |
commit | 1dd06ae8db716e17ec7e06244b858606edf378c0 (patch) | |
tree | ae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/alteon | |
parent | 45122ca26ced7fae41049326a3797a73f961db2e (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/alteon')
-rw-r--r-- | drivers/net/ethernet/alteon/acenic.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c index dfddce6342e5..c0bc41a784ca 100644 --- a/drivers/net/ethernet/alteon/acenic.c +++ b/drivers/net/ethernet/alteon/acenic.c | |||
@@ -455,7 +455,7 @@ static const struct net_device_ops ace_netdev_ops = { | |||
455 | }; | 455 | }; |
456 | 456 | ||
457 | static int acenic_probe_one(struct pci_dev *pdev, | 457 | static int acenic_probe_one(struct pci_dev *pdev, |
458 | const struct pci_device_id *id) | 458 | const struct pci_device_id *id) |
459 | { | 459 | { |
460 | struct net_device *dev; | 460 | struct net_device *dev; |
461 | struct ace_private *ap; | 461 | struct ace_private *ap; |
@@ -2825,7 +2825,7 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev) | |||
2825 | 2825 | ||
2826 | 2826 | ||
2827 | static void ace_copy(struct ace_regs __iomem *regs, const __be32 *src, | 2827 | static void ace_copy(struct ace_regs __iomem *regs, const __be32 *src, |
2828 | u32 dest, int size) | 2828 | u32 dest, int size) |
2829 | { | 2829 | { |
2830 | void __iomem *tdest; | 2830 | void __iomem *tdest; |
2831 | short tsize, i; | 2831 | short tsize, i; |
@@ -3091,8 +3091,7 @@ static void eeprom_stop(struct ace_regs __iomem *regs) | |||
3091 | /* | 3091 | /* |
3092 | * Read a whole byte from the EEPROM. | 3092 | * Read a whole byte from the EEPROM. |
3093 | */ | 3093 | */ |
3094 | static int read_eeprom_byte(struct net_device *dev, | 3094 | static int read_eeprom_byte(struct net_device *dev, unsigned long offset) |
3095 | unsigned long offset) | ||
3096 | { | 3095 | { |
3097 | struct ace_private *ap = netdev_priv(dev); | 3096 | struct ace_private *ap = netdev_priv(dev); |
3098 | struct ace_regs __iomem *regs = ap->regs; | 3097 | struct ace_regs __iomem *regs = ap->regs; |