From: Ethan Nelson-Moore Date: Thu, 21 May 2026 00:16:16 +0000 (-0700) Subject: net: arcnet: remove code depending on nonexistent config option X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c1125f6d4843e49bbbf7127b4b48a57fef50cc06;p=thirdparty%2Fkernel%2Flinux.git net: arcnet: remove code depending on nonexistent config option The CONFIG_SA1100_CT6001 option has never existed in the kernel. Remove code in arcdevice.h referring to it. This allows the arcnet_(in|out)(s|)b macros to be simplified by removing the BUS_ALIGN macro. Signed-off-by: Ethan Nelson-Moore Link: https://patch.msgid.link/20260521001631.45434-5-enelsonmoore@gmail.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/arcnet/arcdevice.h b/drivers/net/arcnet/arcdevice.h index f1947342d67f..c870b8e21d44 100644 --- a/drivers/net/arcnet/arcdevice.h +++ b/drivers/net/arcnet/arcdevice.h @@ -374,24 +374,16 @@ static inline void arcnet_set_addr(struct net_device *dev, u8 addr) /* I/O equivalents */ -#ifdef CONFIG_SA1100_CT6001 -#define BUS_ALIGN 2 /* 8 bit device on a 16 bit bus - needs padding */ -#else -#define BUS_ALIGN 1 -#endif - -/* addr and offset allow register like names to define the actual IO address. - * A configuration option multiplies the offset for alignment. - */ +/* addr and offset allow register like names to define the actual IO address */ #define arcnet_inb(addr, offset) \ - inb((addr) + BUS_ALIGN * (offset)) + inb((addr) + (offset)) #define arcnet_outb(value, addr, offset) \ - outb(value, (addr) + BUS_ALIGN * (offset)) + outb(value, (addr) + (offset)) #define arcnet_insb(addr, offset, buffer, count) \ - insb((addr) + BUS_ALIGN * (offset), buffer, count) + insb((addr) + (offset), buffer, count) #define arcnet_outsb(addr, offset, buffer, count) \ - outsb((addr) + BUS_ALIGN * (offset), buffer, count) + outsb((addr) + (offset), buffer, count) #define arcnet_readb(addr, offset) \ readb((addr) + (offset))