diff options
| author | Joe Perches <joe@perches.com> | 2015-05-05 10:05:48 -0700 |
|---|---|---|
| committer | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2015-09-23 08:44:22 +0200 |
| commit | 01a1d5ac4e1a5890fd6c0d0ae900e1b6e4f851d6 (patch) | |
| tree | 9901ed198d8af0bf30f79520248fa2dbc29be327 /drivers/net/arcnet/arc-rimi.c | |
| parent | cb334648a10c7fa6f0f163c22602f4dc1c6d56b4 (diff) | |
| download | linux-01a1d5ac4e1a5890fd6c0d0ae900e1b6e4f851d6.tar.bz2 | |
arcnet: Add and remove blank lines
Use a more current kernel line style.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Diffstat (limited to 'drivers/net/arcnet/arc-rimi.c')
| -rw-r--r-- | drivers/net/arcnet/arc-rimi.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index 4644d46b6a5f..e8c15016bb8e 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c @@ -36,10 +36,8 @@ #include <asm/io.h> #include <linux/arcdevice.h> - #define VERSION "arcnet: RIM I (entirely mem-mapped) support\n" - /* Internal function declarations */ static int arcrimi_probe(struct net_device *dev); @@ -78,7 +76,6 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse #define AINTMASK(msk) writeb((msk), _INTMASK) #define SETCONF() writeb(lp->config, _CONFIG) - /* * We cannot probe for a RIM I card; one reason is I don't know how to reset * them. In fact, we can't even get their node ID automatically. So, we @@ -249,7 +246,6 @@ err_free_irq: return -EIO; } - /* * Do a hardware reset on the card, and set up necessary registers. * @@ -308,15 +304,16 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset, { struct arcnet_local *lp = netdev_priv(dev); void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset; + TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count)); } - static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offset, void *buf, int count) { struct arcnet_local *lp = netdev_priv(dev); void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset; + TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); } @@ -374,6 +371,7 @@ static void __exit arc_rimi_exit(void) static int __init arcrimi_setup(char *s) { int ints[8]; + s = get_options(s, 8, ints); if (!ints[0]) return 1; |