leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xsurf100: drop include of lib8390.c

Browse Source 
Now that ax88796.c exports the ax_NS8390_reinit() symbol, we can
include 8390.h instead of lib8390.c, avoiding duplication of that
function and killing a few compile warnings in the bargain.

Fixes: 861928f4e6 ("net-next: New ax88796 platform
driver for Amiga X-Surf 100 Zorro board (m68k)")

Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Schmitz 2021-08-03 13:40:45 +02:00 committed by David S. Miller
parent 375df5f8c1
commit f8ade8dddb
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/8390/xsurf100.c
View File

@ -22,8 +22,6 @@
#define XS100_8390_DATA_WRITE32_BASE 0x0C80 #define XS100_8390_DATA_WRITE32_BASE 0x0C80
#define XS100_8390_DATA_AREA_SIZE 0x80 #define XS100_8390_DATA_AREA_SIZE 0x80
#define __NS8390_init ax_NS8390_init
/* force unsigned long back to 'void __iomem *' */ /* force unsigned long back to 'void __iomem *' */
#define ax_convert_addr(_a) ((void __force __iomem *)(_a)) #define ax_convert_addr(_a) ((void __force __iomem *)(_a))
@ -42,10 +40,7 @@
/* Ensure we have our RCR base value */ /* Ensure we have our RCR base value */
#define AX88796_PLATFORM #define AX88796_PLATFORM
static unsigned char version[] = #include "8390.h"
"ax88796.c: Copyright 2005,2007 Simtec Electronics\n";
#include "lib8390.c"
/* from ne.c */ /* from ne.c */
#define NE_CMD EI_SHIFT(0x00) #define NE_CMD EI_SHIFT(0x00)
@ -232,7 +227,7 @@ static void xs100_block_output(struct net_device *dev, int count,
if (jiffies - dma_start > 2 * HZ / 100) { /* 20ms */ if (jiffies - dma_start > 2 * HZ / 100) { /* 20ms */
netdev_warn(dev, "timeout waiting for Tx RDC.\n"); netdev_warn(dev, "timeout waiting for Tx RDC.\n");
ei_local->reset_8390(dev); ei_local->reset_8390(dev);
ax_NS8390_init(dev, 1); ax_NS8390_reinit(dev);
break; break;
} }
} }

6
init/main.c
View File

@ -1221,7 +1221,7 @@ trace_initcall_start_cb(void *data, initcall_t fn)
{ {
ktime_t *calltime = (ktime_t *)data; ktime_t *calltime = (ktime_t *)data;
printk(KERN_DEBUG "calling %pS @ %i\n", fn, task_pid_nr(current)); printk(KERN_DEBUG "calling %pS @ %i irqs_disabled() %d\n", fn, task_pid_nr(current), irqs_disabled());
*calltime = ktime_get(); *calltime = ktime_get();
} }
@ -1235,8 +1235,8 @@ trace_initcall_finish_cb(void *data, initcall_t fn, int ret)
rettime = ktime_get(); rettime = ktime_get();
delta = ktime_sub(rettime, *calltime); delta = ktime_sub(rettime, *calltime);
duration = (unsigned long long) ktime_to_ns(delta) >> 10; duration = (unsigned long long) ktime_to_ns(delta) >> 10;
printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n", printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs, irqs_disabled() %d\n",
fn, ret, duration); fn, ret, duration, irqs_disabled());
} }
static ktime_t initcall_calltime; static ktime_t initcall_calltime;