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

floppy: Replace custom SZ_64K constant 



There are only two headers using the K_64 custom constant. Moreover,
its usage tangles a code because the constant is defined in the C
file, while users are in the headers. Replace it with well defined
SZ_64K from sizes.h.

Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250825163545.39303-3-andriy.shevchenko@linux.intel.com


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

arch/parisc/include/asm/floppy.h

+3 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
#ifndef __ASM_PARISC_FLOPPY_H

#define __ASM_PARISC_FLOPPY_H



#include <linux/sizes.h>

#include <linux/vmalloc.h>





/*

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

 * addresses >= 16MB
@@ -20,7 +20,8 @@ 
 * floppy accesses go through the track buffer.

 */

#define _CROSS_64KB(a,s,vdma) \

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

	(!(vdma) && \

	 ((unsigned long)(a) / SZ_64K != ((unsigned long)(a) + (s) - 1) / SZ_64K))



#define SW fd_routine[use_virtual_dma&1]

#define CSW fd_routine[can_use_virtual_dma & 1]

arch/x86/include/asm/floppy.h

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#ifndef _ASM_X86_FLOPPY_H

#define _ASM_X86_FLOPPY_H



#include <linux/sizes.h>

#include <linux/vmalloc.h>



/*
@@ -22,7 +23,7 @@ 
 */

#define _CROSS_64KB(a, s, vdma)						\

	(!(vdma) &&							\

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

	 ((unsigned long)(a) / SZ_64K != ((unsigned long)(a) + (s) - 1) / SZ_64K))



#define SW fd_routine[use_virtual_dma & 1]

#define CSW fd_routine[can_use_virtual_dma & 1]

drivers/block/floppy.c

+0 −2
Original line number Diff line number Diff line
@@ -233,8 +233,6 @@ static unsigned short virtual_dma_port = 0x3f0; 
irqreturn_t floppy_interrupt(int irq, void *dev_id);

static int set_dor(int fdc, char mask, char data);



#define K_64	0x10000		/* 64KB */



/* the following is the mask of allowed drives. By default units 2 and

 * 3 of both floppy controllers are disabled, because switching on the

 * motor of these drives causes system hangs on some PCI computers. drive