aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dgrs.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
commit6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch)
treedf0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/dgrs.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/dgrs.c')
-rw-r--r--drivers/net/dgrs.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index fa4f09432975..e9361cb5f4cd 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -874,7 +874,7 @@ static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd)
874 privN->bcomm->bc_filter_port = ioc.port; 874 privN->bcomm->bc_filter_port = ioc.port;
875 privN->bcomm->bc_filter_num = ioc.filter; 875 privN->bcomm->bc_filter_num = ioc.filter;
876 privN->bcomm->bc_filter_len = ioc.len; 876 privN->bcomm->bc_filter_len = ioc.len;
877 877
878 if (ioc.len) 878 if (ioc.len)
879 { 879 {
880 if(copy_from_user(S2HN(privN->bcomm->bc_filter_area), 880 if(copy_from_user(S2HN(privN->bcomm->bc_filter_area),
@@ -986,7 +986,7 @@ ack_intr:
986/* 986/*
987 * Download the board firmware 987 * Download the board firmware
988 */ 988 */
989static int __init 989static int __init
990dgrs_download(struct net_device *dev0) 990dgrs_download(struct net_device *dev0)
991{ 991{
992 DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; 992 DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv;
@@ -1150,7 +1150,7 @@ dgrs_download(struct net_device *dev0)
1150/* 1150/*
1151 * Probe (init) a board 1151 * Probe (init) a board
1152 */ 1152 */
1153static int __init 1153static int __init
1154dgrs_probe1(struct net_device *dev) 1154dgrs_probe1(struct net_device *dev)
1155{ 1155{
1156 DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; 1156 DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv;
@@ -1190,7 +1190,7 @@ dgrs_probe1(struct net_device *dev)
1190 */ 1190 */
1191 if (priv->plxreg) 1191 if (priv->plxreg)
1192 OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1); 1192 OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1);
1193 1193
1194 rc = request_irq(dev->irq, &dgrs_intr, IRQF_SHARED, "RightSwitch", dev); 1194 rc = request_irq(dev->irq, &dgrs_intr, IRQF_SHARED, "RightSwitch", dev);
1195 if (rc) 1195 if (rc)
1196 goto err_out; 1196 goto err_out;
@@ -1228,7 +1228,7 @@ err_out:
1228 return rc; 1228 return rc;
1229} 1229}
1230 1230
1231static int __init 1231static int __init
1232dgrs_initclone(struct net_device *dev) 1232dgrs_initclone(struct net_device *dev)
1233{ 1233{
1234 DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; 1234 DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv;
@@ -1243,7 +1243,7 @@ dgrs_initclone(struct net_device *dev)
1243 return (0); 1243 return (0);
1244} 1244}
1245 1245
1246static struct net_device * __init 1246static struct net_device * __init
1247dgrs_found_device( 1247dgrs_found_device(
1248 int io, 1248 int io,
1249 ulong mem, 1249 ulong mem,
@@ -1276,9 +1276,9 @@ dgrs_found_device(
1276 1276
1277 SET_MODULE_OWNER(dev); 1277 SET_MODULE_OWNER(dev);
1278 SET_NETDEV_DEV(dev, pdev); 1278 SET_NETDEV_DEV(dev, pdev);
1279 1279
1280 ret = dgrs_probe1(dev); 1280 ret = dgrs_probe1(dev);
1281 if (ret) 1281 if (ret)
1282 goto err1; 1282 goto err1;
1283 1283
1284 ret = register_netdev(dev); 1284 ret = register_netdev(dev);
@@ -1301,7 +1301,7 @@ dgrs_found_device(
1301 /* Allocate new dev and priv structures */ 1301 /* Allocate new dev and priv structures */
1302 devN = alloc_etherdev(sizeof(DGRS_PRIV)); 1302 devN = alloc_etherdev(sizeof(DGRS_PRIV));
1303 ret = -ENOMEM; 1303 ret = -ENOMEM;
1304 if (!devN) 1304 if (!devN)
1305 goto fail; 1305 goto fail;
1306 1306
1307 /* Don't copy the network device structure! */ 1307 /* Don't copy the network device structure! */
@@ -1335,7 +1335,7 @@ dgrs_found_device(
1335 } 1335 }
1336 return dev; 1336 return dev;
1337 1337
1338 fail: 1338 fail:
1339 while (i >= 0) { 1339 while (i >= 0) {
1340 struct net_device *d = priv->devtbl[i--]; 1340 struct net_device *d = priv->devtbl[i--];
1341 unregister_netdev(d); 1341 unregister_netdev(d);
@@ -1480,7 +1480,7 @@ static int __init dgrs_eisa_probe (struct device *gendev)
1480 return -EBUSY; 1480 return -EBUSY;
1481 } 1481 }
1482 1482
1483 if ( ! (inb(io+ES4H_EC) & ES4H_EC_ENABLE) ) 1483 if ( ! (inb(io+ES4H_EC) & ES4H_EC_ENABLE) )
1484 goto err_out; 1484 goto err_out;
1485 1485
1486 mem = (inb(io+ES4H_AS_31_24) << 24) 1486 mem = (inb(io+ES4H_AS_31_24) << 24)
@@ -1504,11 +1504,11 @@ static int __init dgrs_eisa_probe (struct device *gendev)
1504static int __devexit dgrs_eisa_remove(struct device *gendev) 1504static int __devexit dgrs_eisa_remove(struct device *gendev)
1505{ 1505{
1506 struct net_device *dev = gendev->driver_data; 1506 struct net_device *dev = gendev->driver_data;
1507 1507
1508 dgrs_remove(dev); 1508 dgrs_remove(dev);
1509 1509
1510 release_region(dev->base_addr, 256); 1510 release_region(dev->base_addr, 256);
1511 1511
1512 free_netdev(dev); 1512 free_netdev(dev);
1513 return 0; 1513 return 0;
1514} 1514}