ARCNET is a museums piece and the function timing can be done with ftrace. Remove the cruft.
Signed-off-by: Thomas Gleixner <[email protected]> Cc: Michael Grzeschik <[email protected]> Cc: [email protected] --- drivers/net/arcnet/arc-rimi.c | 4 ++-- drivers/net/arcnet/arcdevice.h | 20 +------------------- drivers/net/arcnet/com20020.c | 6 ++---- drivers/net/arcnet/com90io.c | 6 ++---- drivers/net/arcnet/com90xx.c | 4 ++-- 5 files changed, 9 insertions(+), 31 deletions(-) --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c @@ -291,7 +291,7 @@ static void arcrimi_copy_to_card(struct struct arcnet_local *lp = netdev_priv(dev); void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset; - TIME(dev, "memcpy_toio", count, memcpy_toio(memaddr, buf, count)); + memcpy_toio(memaddr, buf, count); } static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, @@ -300,7 +300,7 @@ static void arcrimi_copy_from_card(struc struct arcnet_local *lp = netdev_priv(dev); void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset; - TIME(dev, "memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); + memcpy_fromio(buf, memaddr, count); } static int node; --- a/drivers/net/arcnet/arcdevice.h +++ b/drivers/net/arcnet/arcdevice.h @@ -11,7 +11,6 @@ #ifndef _LINUX_ARCDEVICE_H #define _LINUX_ARCDEVICE_H -#include <asm/timex.h> #include <linux/if_arcnet.h> #ifdef __KERNEL__ @@ -62,7 +61,7 @@ #define D_RX 512 /* show rx packets */ #define D_SKB 1024 /* show skb's */ #define D_SKB_SIZE 2048 /* show skb sizes */ -#define D_TIMING 4096 /* show time needed to copy buffers to card */ +#define D_TIMING 4096 /* Not longer supported. Use tracing instead */ #define D_DEBUG 8192 /* Very detailed debug line for line */ #ifndef ARCNET_DEBUG_MAX @@ -95,23 +94,6 @@ do { \ pr_cont(fmt, ##__VA_ARGS__); \ } while (0) -/* see how long a function call takes to run, expressed in CPU cycles */ -#define TIME(dev, name, bytes, call) \ -do { \ - if (BUGLVL(D_TIMING)) { \ - unsigned long _x, _y; \ - _x = get_cycles(); \ - call; \ - _y = get_cycles(); \ - arc_printk(D_TIMING, dev, \ - "%s: %d bytes in %lu cycles == %lu Kbytes/100Mcycle\n", \ - name, bytes, _y - _x, \ - 100000000 / 1024 * bytes / (_y - _x + 1)); \ - } else { \ - call; \ - } \ -} while (0) - /* * Time needed to reset the card - in ms (milliseconds). This works on my * SMC PC100. I can't find a reference that tells me just how long I --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c @@ -70,8 +70,7 @@ static void com20020_copy_from_card(stru arcnet_outb(ofs & 0xff, ioaddr, COM20020_REG_W_ADDR_LO); /* copy the data */ - TIME(dev, "insb", count, - arcnet_insb(ioaddr, COM20020_REG_RW_MEMDATA, buf, count)); + arcnet_insb(ioaddr, COM20020_REG_RW_MEMDATA, buf, count); } static void com20020_copy_to_card(struct net_device *dev, int bufnum, @@ -84,8 +83,7 @@ static void com20020_copy_to_card(struct arcnet_outb(ofs & 0xff, ioaddr, COM20020_REG_W_ADDR_LO); /* copy the data */ - TIME(dev, "outsb", count, - arcnet_outsb(ioaddr, COM20020_REG_RW_MEMDATA, buf, count)); + arcnet_outsb(ioaddr, COM20020_REG_RW_MEMDATA, buf, count); } /* Reset the card and check some basic stuff during the detection stage. */ --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c @@ -332,15 +332,13 @@ static void com90io_setmask(struct net_d static void com90io_copy_to_card(struct net_device *dev, int bufnum, int offset, void *buf, int count) { - TIME(dev, "put_whole_buffer", count, - put_whole_buffer(dev, bufnum * 512 + offset, count, buf)); + put_whole_buffer(dev, bufnum * 512 + offset, count, buf); } static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offset, void *buf, int count) { - TIME(dev, "get_whole_buffer", count, - get_whole_buffer(dev, bufnum * 512 + offset, count, buf)); + get_whole_buffer(dev, bufnum * 512 + offset, count, buf); } static int io; /* use the insmod io= irq= shmem= options */ --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c @@ -633,7 +633,7 @@ static void com90xx_copy_to_card(struct struct arcnet_local *lp = netdev_priv(dev); void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; - TIME(dev, "memcpy_toio", count, memcpy_toio(memaddr, buf, count)); + memcpy_toio(memaddr, buf, count); } static void com90xx_copy_from_card(struct net_device *dev, int bufnum, @@ -642,7 +642,7 @@ static void com90xx_copy_from_card(struc struct arcnet_local *lp = netdev_priv(dev); void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; - TIME(dev, "memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); + memcpy_fromio(buf, memaddr, count); } MODULE_DESCRIPTION("ARCnet COM90xx normal chipset driver");
