Commit d7496878 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jens Axboe
Browse files

floppy: Remove unused CROSS_64KB() macro from arch/ code 



Since the commit 3d86739c ("floppy: always use the track buffer")
the CROSS_64KB() is not used by the driver, remove the leftovers.

Acked-by: Helge Deller <deller@gmx.de> #parisc
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250825163545.39303-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f5d10e69

arch/alpha/include/asm/floppy.h

+0 −19
Original line number Diff line number Diff line
@@ -90,25 +90,6 @@ static int FDC2 = -1; 
#define N_FDC 2

#define N_DRIVE 8



/*

 * Most Alphas have no problems with floppy DMA crossing 64k borders,

 * except for certain ones, like XL and RUFFIAN.

 *

 * However, the test is simple and fast, and this *is* floppy, after all,

 * so we do it for all platforms, just to make sure.

 *

 * This is advantageous in other circumstances as well, as in moving

 * about the PCI DMA windows and forcing the floppy to start doing

 * scatter-gather when it never had before, and there *is* a problem

 * on that platform... ;-}

 */



static inline unsigned long CROSS_64KB(void *a, unsigned long s)

{

	unsigned long p = (unsigned long)a;

	return ((p + s - 1) ^ p) & ~0xffffUL;

}



#define EXTRA_FLOPPY_PARAMS



#endif /* __ASM_ALPHA_FLOPPY_H */

arch/arm/include/asm/floppy.h

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ static unsigned char floppy_selects[4] = { 0x10, 0x21, 0x23, 0x33 }; 
#define N_FDC 1

#define N_DRIVE 4



#define CROSS_64KB(a,s) (0)



/*

 * This allows people to reverse the order of

 * fd0 and fd1, in case their hardware is

arch/m68k/include/asm/floppy.h

+0 −4
Original line number Diff line number Diff line
@@ -107,13 +107,9 @@ static void fd_free_irq(void) 


#define fd_free_dma()             /* nothing */



/* No 64k boundary crossing problems on Q40 - no DMA at all */

#define CROSS_64KB(a,s) (0)



#define DMA_MODE_READ  0x44    /* i386 look-alike */

#define DMA_MODE_WRITE 0x48





static int m68k_floppy_init(void)

{

  use_virtual_dma =1;

arch/mips/include/asm/floppy.h

+0 −15
Original line number Diff line number Diff line
@@ -34,21 +34,6 @@ static inline void fd_cacheflush(char * addr, long size) 
#define N_FDC 1			/* do you *really* want a second controller? */

#define N_DRIVE 8



/*

 * The DMA channel used by the floppy controller cannot access data at

 * addresses >= 16MB

 *

 * Went back to the 1MB limit, as some people had problems with the floppy

 * driver otherwise. It doesn't matter much for performance anyway, as most

 * floppy accesses go through the track buffer.

 *

 * On MIPSes using vdma, this actually means that *all* transfers go thru

 * the * track buffer since 0x1000000 is always smaller than KSEG0/1.

 * Actually this needs to be a bit more complicated since the so much different

 * hardware available with MIPS CPUs ...

 */

#define CROSS_64KB(a, s) ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)



#define EXTRA_FLOPPY_PARAMS



#include <floppy.h>

arch/parisc/include/asm/floppy.h

+1 −5
Original line number Diff line number Diff line
@@ -22,13 +22,9 @@ 
#define _CROSS_64KB(a,s,vdma) \

(!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64))



#define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1)





#define SW fd_routine[use_virtual_dma&1]

#define CSW fd_routine[can_use_virtual_dma & 1]





#define fd_inb(base, reg)		readb((base) + (reg))

#define fd_outb(value, base, reg)	writeb(value, (base) + (reg))
@@ -206,7 +202,7 @@ static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) 
static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)

{

#ifdef FLOPPY_SANITY_CHECK

	if (CROSS_64KB(addr, size)) {

	if (_CROSS_64KB(addr, size, use_virtual_dma & 1)) {

		printk("DMA crossing 64-K boundary %p-%p\n", addr, addr+size);

		return -1;

	}