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/sis | |
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/sis')
-rw-r--r-- | drivers/net/ethernet/sis/sis190.c | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/sis/sis900.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c index c114c4f9cea8..9a9c379420d1 100644 --- a/drivers/net/ethernet/sis/sis190.c +++ b/drivers/net/ethernet/sis/sis190.c | |||
@@ -1574,7 +1574,7 @@ static void sis190_set_rgmii(struct sis190_private *tp, u8 reg) | |||
1574 | } | 1574 | } |
1575 | 1575 | ||
1576 | static int sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, | 1576 | static int sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, |
1577 | struct net_device *dev) | 1577 | struct net_device *dev) |
1578 | { | 1578 | { |
1579 | struct sis190_private *tp = netdev_priv(dev); | 1579 | struct sis190_private *tp = netdev_priv(dev); |
1580 | void __iomem *ioaddr = tp->mmio_addr; | 1580 | void __iomem *ioaddr = tp->mmio_addr; |
@@ -1616,7 +1616,7 @@ static int sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, | |||
1616 | * MAC address is read into @net_dev->dev_addr. | 1616 | * MAC address is read into @net_dev->dev_addr. |
1617 | */ | 1617 | */ |
1618 | static int sis190_get_mac_addr_from_apc(struct pci_dev *pdev, | 1618 | static int sis190_get_mac_addr_from_apc(struct pci_dev *pdev, |
1619 | struct net_device *dev) | 1619 | struct net_device *dev) |
1620 | { | 1620 | { |
1621 | static const u16 ids[] = { 0x0965, 0x0966, 0x0968 }; | 1621 | static const u16 ids[] = { 0x0965, 0x0966, 0x0968 }; |
1622 | struct sis190_private *tp = netdev_priv(dev); | 1622 | struct sis190_private *tp = netdev_priv(dev); |
@@ -1693,8 +1693,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev) | |||
1693 | SIS_PCI_COMMIT(); | 1693 | SIS_PCI_COMMIT(); |
1694 | } | 1694 | } |
1695 | 1695 | ||
1696 | static int sis190_get_mac_addr(struct pci_dev *pdev, | 1696 | static int sis190_get_mac_addr(struct pci_dev *pdev, struct net_device *dev) |
1697 | struct net_device *dev) | ||
1698 | { | 1697 | { |
1699 | int rc; | 1698 | int rc; |
1700 | 1699 | ||
@@ -1846,7 +1845,7 @@ static const struct net_device_ops sis190_netdev_ops = { | |||
1846 | }; | 1845 | }; |
1847 | 1846 | ||
1848 | static int sis190_init_one(struct pci_dev *pdev, | 1847 | static int sis190_init_one(struct pci_dev *pdev, |
1849 | const struct pci_device_id *ent) | 1848 | const struct pci_device_id *ent) |
1850 | { | 1849 | { |
1851 | static int printed_version = 0; | 1850 | static int printed_version = 0; |
1852 | struct sis190_private *tp; | 1851 | struct sis190_private *tp; |
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index 88c6c4243cb3..5bffd9749a58 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c | |||
@@ -435,7 +435,7 @@ static const struct net_device_ops sis900_netdev_ops = { | |||
435 | */ | 435 | */ |
436 | 436 | ||
437 | static int sis900_probe(struct pci_dev *pci_dev, | 437 | static int sis900_probe(struct pci_dev *pci_dev, |
438 | const struct pci_device_id *pci_id) | 438 | const struct pci_device_id *pci_id) |
439 | { | 439 | { |
440 | struct sis900_private *sis_priv; | 440 | struct sis900_private *sis_priv; |
441 | struct net_device *net_dev; | 441 | struct net_device *net_dev; |