Hi Arnd,
Am 16.05.2021 um 21:52 schrieb Arnd Bergmann:
On Sun, Jun 10, 2018 at 6:23 AM Michael Schmitz <schmitzmic@xxxxxxxxx> wrote:
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: 861928f4e60e826c ("net-next: New ax88796 platform
driver for Amiga X-Surf 100 Zorro board (m68k)")
Signed-off-by: Michael Schmitz <schmitzmic@xxxxxxxxx>
---
drivers/net/ethernet/8390/xsurf100.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
Geert noticed that a patch I just sent is similar to this one. Since I assume
you have verified this version works, it would be nice if you could resend
both patches.
Oh dear - I had all but forgotten about this one. The patch announcement
states it was tested on elgar so yes, this version works.
These patches originated in a review comment by Geert for the original
xsurf100 driver that came after Dave had accepted the driver. Might even
have been misrouted by me (I wasn't very clear whether net or net-next
was appropriate). I evidently never followed up.
Which reminds me to check how far we ever got with testing the XSurf500
driver that's still stuck in my tree.
Alternatively, I can include them in my series if you like.
Please do that - I haven't followed net-next for over a year and don't
have a current enough tree to rebase this on.
Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx
diff --git a/drivers/net/ethernet/8390/xsurf100.c b/drivers/net/ethernet/8390/xsurf100.c
index e2c9638..1c3e8d1 100644
--- a/drivers/net/ethernet/8390/xsurf100.c
+++ b/drivers/net/ethernet/8390/xsurf100.c
@@ -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,11 @@
/* Ensure we have our RCR base value */
#define AX88796_PLATFORM
-static unsigned char version[] =
- "ax88796.c: Copyright 2005,2007 Simtec Electronics\n";
+#define NS8390_CORE
+#include "8390.h"
I don't see that #define being referenced anywhere, can that be dropped?
Can't find it used anywhere either, so I'm confident it can be dropped.
While you're at it, I believe it can be dropped from lib8390.c as well
now (that's where I copied it from). Dave would know for sure.
Cheers,
Michael
Arnd
