Commit f8ade8dd authored by Michael Schmitz's avatar Michael Schmitz Committed by David S. Miller
Browse files

xsurf100: drop include of lib8390.c 



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: 861928f4 ("net-next: New ax88796 platform
driver for Amiga X-Surf 100 Zorro board (m68k)")

Signed-off-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 375df5f8

drivers/net/ethernet/8390/xsurf100.c

+2 −7
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#define XS100_8390_DATA_WRITE32_BASE 0x0C80

#define XS100_8390_DATA_AREA_SIZE 0x80



#define __NS8390_init ax_NS8390_init



/* force unsigned long back to 'void __iomem *' */

#define ax_convert_addr(_a) ((void __force __iomem *)(_a))
@@ -42,10 +40,7 @@ 
/* Ensure we have our RCR base value */

#define AX88796_PLATFORM



static unsigned char version[] =

		"ax88796.c: Copyright 2005,2007 Simtec Electronics\n";



#include "lib8390.c"

#include "8390.h"



/* from ne.c */

#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 */

			netdev_warn(dev, "timeout waiting for Tx RDC.\n");

			ei_local->reset_8390(dev);

			ax_NS8390_init(dev, 1);

			ax_NS8390_reinit(dev);

			break;

		}

	}

init/main.c

+3 −3
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ trace_initcall_start_cb(void *data, initcall_t fn) 
{

	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();

}
@@ -1235,8 +1235,8 @@ trace_initcall_finish_cb(void *data, initcall_t fn, int ret) 
	rettime = ktime_get();

	delta = ktime_sub(rettime, *calltime);

	duration = (unsigned long long) ktime_to_ns(delta) >> 10;

	printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n",

		 fn, ret, duration);

	printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs, irqs_disabled() %d\n",

		 fn, ret, duration, irqs_disabled());

}



static ktime_t initcall_calltime;