aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/toshiba
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/toshiba
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/toshiba')
-rw-r--r--drivers/net/ethernet/toshiba/ps3_gelic_net.c10
-rw-r--r--drivers/net/ethernet/toshiba/tc35815.c2
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index d7c8af7cca02..e321d0b6fc88 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -235,9 +235,8 @@ static void gelic_card_free_chain(struct gelic_card *card,
235 * returns 0 on success, <0 on failure 235 * returns 0 on success, <0 on failure
236 */ 236 */
237static int gelic_card_init_chain(struct gelic_card *card, 237static int gelic_card_init_chain(struct gelic_card *card,
238 struct gelic_descr_chain *chain, 238 struct gelic_descr_chain *chain,
239 struct gelic_descr *start_descr, 239 struct gelic_descr *start_descr, int no)
240 int no)
241{ 240{
242 int i; 241 int i;
243 struct gelic_descr *descr; 242 struct gelic_descr *descr;
@@ -1469,7 +1468,7 @@ static const struct net_device_ops gelic_netdevice_ops = {
1469 * fills out function pointers in the net_device structure 1468 * fills out function pointers in the net_device structure
1470 */ 1469 */
1471static void gelic_ether_setup_netdev_ops(struct net_device *netdev, 1470static void gelic_ether_setup_netdev_ops(struct net_device *netdev,
1472 struct napi_struct *napi) 1471 struct napi_struct *napi)
1473{ 1472{
1474 netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT; 1473 netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT;
1475 /* NAPI */ 1474 /* NAPI */
@@ -1489,8 +1488,7 @@ static void gelic_ether_setup_netdev_ops(struct net_device *netdev,
1489 * gelic_ether_setup_netdev initializes the net_device structure 1488 * gelic_ether_setup_netdev initializes the net_device structure
1490 * and register it. 1489 * and register it.
1491 **/ 1490 **/
1492int gelic_net_setup_netdev(struct net_device *netdev, 1491int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card)
1493 struct gelic_card *card)
1494{ 1492{
1495 int status; 1493 int status;
1496 u64 v1, v2; 1494 u64 v1, v2;
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 5db09efae927..9819349eaa1e 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -786,7 +786,7 @@ static const struct net_device_ops tc35815_netdev_ops = {
786}; 786};
787 787
788static int tc35815_init_one(struct pci_dev *pdev, 788static int tc35815_init_one(struct pci_dev *pdev,
789 const struct pci_device_id *ent) 789 const struct pci_device_id *ent)
790{ 790{
791 void __iomem *ioaddr = NULL; 791 void __iomem *ioaddr = NULL;
792 struct net_device *dev; 792 struct net_device *dev;