From nobody Fri Oct 3 20:24:58 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0146301461; Mon, 25 Aug 2025 16:35:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756139761; cv=none; b=BqHL0Uf7ALCm0k8JViYfzHRaIsdnKAKuKODYeHtMkNgWiMrPrkvkXbLHdhQ2YXs87IQM0U9q5YNhYM3udIfib5b1D3Tv/l5ZjG0x+/FfmCNjVtlkLsxHFD2AA0WBUfbs9lTRSfWZPegy0aeY9PjuDqTLiNnIoXgPQH/s17iFgEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756139761; c=relaxed/simple; bh=PS/OiIArs4RSteWG5A2HsYSRM0QB2lTSwsrYC9cKG4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FTOzDyAgpOFshMygZmxL+4z04w0HGyLmxxyM8QwXsI+9FhdfgkDW6VqB8YQgL68WOJDEtPc6Or8D97IxG5kEg65CFb+oJXtS7TRw3h1+k8+8QKgTYUiEBehkPFodExxLmYIJr27GBfhzq408WiZvHL44sgdO0RD9ez2ePcJBbU8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=g2kev6gA; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="g2kev6gA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1756139760; x=1787675760; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PS/OiIArs4RSteWG5A2HsYSRM0QB2lTSwsrYC9cKG4M=; b=g2kev6gAEHNbQoJTdQTGMm+6bSwpxoVIO2E+SGIgKtXK0sdM25zSfmWh KmxM7nrOMRiWgFNgEqb2HXxmWYUswvLnIyWrr5HQ+WI/hVYof1OXUMiqM px28Gba/EWaVxSMnGI67DulqmQEvcmL8WWPQw79nsduU0Sx42ufu7Httn 53yqEwiahCqkhfroHIynSBCYNALU9wgdM5tv9UHAuW6yUDSDoV3rvN9Gh S9TdapikX++9vIdBBcFP6To6LMTSUiaJx2azvVrwp6UHxkfUUaNI1Kv+3 ca5ZTgYUg5rQsVxDJtWp6CyAovdN95TyEpW4iAWb3ptt6cCFKl8J4ApFW Q==; X-CSE-ConnectionGUID: izZtqX+kToa9y+cqaaxSdw== X-CSE-MsgGUID: UHkXIsxlQXO2E6GblNAaag== X-IronPort-AV: E=McAfee;i="6800,10657,11533"; a="58288851" X-IronPort-AV: E=Sophos;i="6.18,213,1751266800"; d="scan'208";a="58288851" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2025 09:35:56 -0700 X-CSE-ConnectionGUID: nO/0WE7KShWApODQpA5OPg== X-CSE-MsgGUID: LHnzXcOgSQiFreIo9l4a7g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,213,1751266800"; d="scan'208";a="168588222" Received: from black.igk.intel.com ([10.91.253.5]) by orviesa010.jf.intel.com with ESMTP; 25 Aug 2025 09:35:48 -0700 Received: by black.igk.intel.com (Postfix, from userid 1003) id D944395; Mon, 25 Aug 2025 18:35:46 +0200 (CEST) From: Andy Shevchenko To: Helge Deller , Andy Shevchenko , Geert Uytterhoeven , Thomas Fourier , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-block@vger.kernel.org Cc: Richard Henderson , Matt Turner , Ian Molton , Russell King , Thomas Bogendoerfer , "James E.J. Bottomley" , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "David S. Miller" , Andreas Larsson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Denis Efremov , Jens Axboe , Andrew Morton Subject: [PATCH v2 1/3] floppy: Remove unused CROSS_64KB() macro from arch/ code Date: Mon, 25 Aug 2025 18:32:55 +0200 Message-ID: <20250825163545.39303-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250825163545.39303-1-andriy.shevchenko@linux.intel.com> References: <20250825163545.39303-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since the commit 3d86739c6343 ("floppy: always use the track buffer") the CROSS_64KB() is not used by the driver, remove the leftovers. Acked-by: Helge Deller #parisc Acked-by: Geert Uytterhoeven # m68k Signed-off-by: Andy Shevchenko --- arch/alpha/include/asm/floppy.h | 19 ------------------- arch/arm/include/asm/floppy.h | 2 -- arch/m68k/include/asm/floppy.h | 4 ---- arch/mips/include/asm/floppy.h | 15 --------------- arch/parisc/include/asm/floppy.h | 6 +----- arch/powerpc/include/asm/floppy.h | 5 ----- arch/sparc/include/asm/floppy_32.h | 3 --- arch/sparc/include/asm/floppy_64.h | 3 --- arch/x86/include/asm/floppy.h | 5 +---- 9 files changed, 2 insertions(+), 60 deletions(-) diff --git a/arch/alpha/include/asm/floppy.h b/arch/alpha/include/asm/flopp= y.h index 64b42d9591fc..5a6239e65097 100644 --- a/arch/alpha/include/asm/floppy.h +++ b/arch/alpha/include/asm/floppy.h @@ -90,25 +90,6 @@ static int FDC2 =3D -1; #define N_FDC 2 #define N_DRIVE 8 =20 -/* - * 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 =3D (unsigned long)a; - return ((p + s - 1) ^ p) & ~0xffffUL; -} - #define EXTRA_FLOPPY_PARAMS =20 #endif /* __ASM_ALPHA_FLOPPY_H */ diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h index e1cb04ed5008..e579f77162e9 100644 --- a/arch/arm/include/asm/floppy.h +++ b/arch/arm/include/asm/floppy.h @@ -65,8 +65,6 @@ static unsigned char floppy_selects[4] =3D { 0x10, 0x21, = 0x23, 0x33 }; #define N_FDC 1 #define N_DRIVE 4 =20 -#define CROSS_64KB(a,s) (0) - /* * This allows people to reverse the order of * fd0 and fd1, in case their hardware is diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h index a4d0fea47c6b..dea98bbc0932 100644 --- a/arch/m68k/include/asm/floppy.h +++ b/arch/m68k/include/asm/floppy.h @@ -107,13 +107,9 @@ static void fd_free_irq(void) =20 #define fd_free_dma() /* nothing */ =20 -/* 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 =20 - static int m68k_floppy_init(void) { use_virtual_dma =3D1; diff --git a/arch/mips/include/asm/floppy.h b/arch/mips/include/asm/floppy.h index 021d09ae5670..44da2ff91f65 100644 --- a/arch/mips/include/asm/floppy.h +++ b/arch/mips/include/asm/floppy.h @@ -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 =20 -/* - * The DMA channel used by the floppy controller cannot access data at - * addresses >=3D 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 diff= erent - * hardware available with MIPS CPUs ... - */ -#define CROSS_64KB(a, s) ((unsigned long)(a)/K_64 !=3D ((unsigned long)(a)= + (s) - 1) / K_64) - #define EXTRA_FLOPPY_PARAMS =20 #include diff --git a/arch/parisc/include/asm/floppy.h b/arch/parisc/include/asm/flo= ppy.h index b318a7df52f6..df20dbef3ada 100644 --- a/arch/parisc/include/asm/floppy.h +++ b/arch/parisc/include/asm/floppy.h @@ -22,13 +22,9 @@ #define _CROSS_64KB(a,s,vdma) \ (!(vdma) && ((unsigned long)(a)/K_64 !=3D ((unsigned long)(a) + (s) - 1) /= K_64)) =20 -#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] =20 - #define fd_inb(base, reg) readb((base) + (reg)) #define fd_outb(value, base, reg) writeb(value, (base) + (reg)) =20 @@ -206,7 +202,7 @@ static int vdma_dma_setup(char *addr, unsigned long siz= e, 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; } diff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/f= loppy.h index 34abf8bea2cc..f4dc657638b3 100644 --- a/arch/powerpc/include/asm/floppy.h +++ b/arch/powerpc/include/asm/floppy.h @@ -206,11 +206,6 @@ static int FDC2 =3D -1; #define N_FDC 2 /* Don't change this! */ #define N_DRIVE 8 =20 -/* - * The PowerPC has no problems with floppy DMA crossing 64k borders. - */ -#define CROSS_64KB(a,s) (0) - #define EXTRA_FLOPPY_PARAMS =20 #endif /* __KERNEL__ */ diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/fl= oppy_32.h index 836f6575aa1d..7251d1fed7a4 100644 --- a/arch/sparc/include/asm/floppy_32.h +++ b/arch/sparc/include/asm/floppy_32.h @@ -96,9 +96,6 @@ static struct sun_floppy_ops sun_fdops; #define N_FDC 1 #define N_DRIVE 8 =20 -/* No 64k boundary crossing problems on the Sparc. */ -#define CROSS_64KB(a,s) (0) - /* Routines unique to each controller type on a Sun. */ static void sun_set_dor(unsigned char value, int fdc_82077) { diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/fl= oppy_64.h index b0f633ce3518..135f9a49b6ba 100644 --- a/arch/sparc/include/asm/floppy_64.h +++ b/arch/sparc/include/asm/floppy_64.h @@ -95,9 +95,6 @@ static int sun_floppy_types[2] =3D { 0, 0 }; #define N_FDC 1 #define N_DRIVE 8 =20 -/* No 64k boundary crossing problems on the Sparc. */ -#define CROSS_64KB(a,s) (0) - static unsigned char sun_82077_fd_inb(unsigned long base, unsigned int reg) { udelay(5); diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h index 6ec3fc969ad5..e76cb74bbed2 100644 --- a/arch/x86/include/asm/floppy.h +++ b/arch/x86/include/asm/floppy.h @@ -24,9 +24,6 @@ (!(vdma) && \ ((unsigned long)(a)/K_64 !=3D ((unsigned long)(a) + (s) - 1) / K_64)) =20 -#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] =20 @@ -206,7 +203,7 @@ static int vdma_dma_setup(char *addr, unsigned long siz= e, 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; } --=20 2.50.1 From nobody Fri Oct 3 20:24:58 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8D812FE58F; Mon, 25 Aug 2025 16:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756139759; cv=none; b=IbX1ik4YgTkB6noV/GoZiSzeATHzQnq/LB17HoDL3wrLWewbpQW8s/9SFyjmTEYnvLc8sjic1zR+3f7s6FMJgcBpnXI1o30M1rH6KIv3KRvboNGaijwUBSZh2zfzdNeey+sWNW1Iy27G55qDmbn/l2qnbymGHu6EK/NYKWwumS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756139759; c=relaxed/simple; bh=4BgR1C08p0drss5NDxXSek6A+9jO5AXL54CNKL2STq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=azHTwOriUAxo53WmyenlR2dbWkQJu5fXAAuf4KE8vL2OrgjMkJU+nSfsfFK27SDrxNGB/Cs5rqBWcowT2NlIQLf7G3G/BI2EHK4gHWxaLuHk2rvtvtnf0y0eYdVwIHFu4sOCO8+Kt+1n1Akcth839f8WOv9zjt6OYGPwWDeZEuU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=IddtJ7b6; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IddtJ7b6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1756139758; x=1787675758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4BgR1C08p0drss5NDxXSek6A+9jO5AXL54CNKL2STq4=; b=IddtJ7b67kNvKBVHp5j6dx/9utGLPI6omcP0MXi3JBQXf/SuufKQCWzS 53WSywoxJ18LbwzUcc1O3CUlii4AyCTJ+f2qNUdDo/LHwP8ZX0XLhtHiU CqDC5ummM+sx41j/57aMvLnF/QZofBzSKGwPj9r5WrscA+i107L6vKbE0 e0A+zuEItfyK9B4CgwTElyrgl0yBxDDymNaEPkB1jdTqEeTCOjFQsAJAe PJByDOXqXlJ9fW4p/0+tra7dH4u3HdebhwtTa63n2bG6SJ0vdhrP4DcVo AIdIQJd5NxloBlbqufi9V3ebouhq5buhVjnPKIuc5vpd+WnEquui3kRj9 g==; X-CSE-ConnectionGUID: D6bcEH8CQpiSRr19qOfJ3Q== X-CSE-MsgGUID: D+b5XW7xQ3u9L5wy6c5PrA== X-IronPort-AV: E=McAfee;i="6800,10657,11533"; a="58288822" X-IronPort-AV: E=Sophos;i="6.18,213,1751266800"; d="scan'208";a="58288822" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2025 09:35:56 -0700 X-CSE-ConnectionGUID: RQaCu0IOQPuihHdwgc5pQg== X-CSE-MsgGUID: snlOI4+aRY2/4OBMeyrQuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,213,1751266800"; d="scan'208";a="168588221" Received: from black.igk.intel.com ([10.91.253.5]) by orviesa010.jf.intel.com with ESMTP; 25 Aug 2025 09:35:48 -0700 Received: by black.igk.intel.com (Postfix, from userid 1003) id DD7AF96; Mon, 25 Aug 2025 18:35:46 +0200 (CEST) From: Andy Shevchenko To: Helge Deller , Andy Shevchenko , Geert Uytterhoeven , Thomas Fourier , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-block@vger.kernel.org Cc: Richard Henderson , Matt Turner , Ian Molton , Russell King , Thomas Bogendoerfer , "James E.J. Bottomley" , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "David S. Miller" , Andreas Larsson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Denis Efremov , Jens Axboe , Andrew Morton Subject: [PATCH v2 2/3] floppy: Replace custom SZ_64K constant Date: Mon, 25 Aug 2025 18:32:56 +0200 Message-ID: <20250825163545.39303-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250825163545.39303-1-andriy.shevchenko@linux.intel.com> References: <20250825163545.39303-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Helge Deller Signed-off-by: Andy Shevchenko --- arch/parisc/include/asm/floppy.h | 5 +++-- arch/x86/include/asm/floppy.h | 3 ++- drivers/block/floppy.c | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/parisc/include/asm/floppy.h b/arch/parisc/include/asm/flo= ppy.h index df20dbef3ada..f15b69fea901 100644 --- a/arch/parisc/include/asm/floppy.h +++ b/arch/parisc/include/asm/floppy.h @@ -8,9 +8,9 @@ #ifndef __ASM_PARISC_FLOPPY_H #define __ASM_PARISC_FLOPPY_H =20 +#include #include =20 - /* * The DMA channel used by the floppy controller cannot access data at * addresses >=3D 16MB @@ -20,7 +20,8 @@ * floppy accesses go through the track buffer. */ #define _CROSS_64KB(a,s,vdma) \ -(!(vdma) && ((unsigned long)(a)/K_64 !=3D ((unsigned long)(a) + (s) - 1) /= K_64)) + (!(vdma) && \ + ((unsigned long)(a) / SZ_64K !=3D ((unsigned long)(a) + (s) - 1) / SZ_64= K)) =20 #define SW fd_routine[use_virtual_dma&1] #define CSW fd_routine[can_use_virtual_dma & 1] diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h index e76cb74bbed2..e7a244051c62 100644 --- a/arch/x86/include/asm/floppy.h +++ b/arch/x86/include/asm/floppy.h @@ -10,6 +10,7 @@ #ifndef _ASM_X86_FLOPPY_H #define _ASM_X86_FLOPPY_H =20 +#include #include =20 /* @@ -22,7 +23,7 @@ */ #define _CROSS_64KB(a, s, vdma) \ (!(vdma) && \ - ((unsigned long)(a)/K_64 !=3D ((unsigned long)(a) + (s) - 1) / K_64)) + ((unsigned long)(a) / SZ_64K !=3D ((unsigned long)(a) + (s) - 1) / SZ_64= K)) =20 #define SW fd_routine[use_virtual_dma & 1] #define CSW fd_routine[can_use_virtual_dma & 1] diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 24be0c2c4075..d769a223fcc8 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -233,8 +233,6 @@ static unsigned short virtual_dma_port =3D 0x3f0; irqreturn_t floppy_interrupt(int irq, void *dev_id); static int set_dor(int fdc, char mask, char data); =20 -#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 --=20 2.50.1 From nobody Fri Oct 3 20:24:58 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA9062FF642; Mon, 25 Aug 2025 16:35:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756139759; cv=none; b=emROIBBzP3i8//1ROchM70GJ84rAiWTncsZkJW0v22XrfFPRc/L393DOM5HSxOZP9P+6Zpz6XGUcbAitqbjkEmNCAyaunped3SvYJfOluLJlFvkPm0tNkqOWlPfKMVi/WKI1aU53Xa2JjSLSX9R+EavI2+ZWMaVudESHmyiOL44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756139759; c=relaxed/simple; bh=WzmZWMms4bv8taptRv7sWNE6UwWdfM4GmVI+cXRz004=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=THcoNSdqtOE6EjE8UN5Mom/ChVXJEklmdAdO5CcUJVzmvgAq4BqqQ0h0gLt3pE7OggBZjeEHLW9gJ/SQ9wyowNpTs5QIMUqM9RjxQgmnjOXw9ltHh7iDou6QJdYbWupulcG0cLDxLnqJ2iSsyjNLd94vP/uVbGHfW5ajBy2Cs5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ipibPTaq; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ipibPTaq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1756139758; x=1787675758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WzmZWMms4bv8taptRv7sWNE6UwWdfM4GmVI+cXRz004=; b=ipibPTaqJsmv1n03Q4LncnYb7c0DDOBwLJlGwq7qljABi+oGsfrS2tam o3Cv9DX0AEjTGCz025YlnfjNVi3XpGQpEgTQcbw4gksk/77ThfK57fNYt LBwirHwZxL4B4EPZNPWTAi8JUcwcrnpYDCNlzSdmFyoBUnod+lBuTf8zT 6Sk6gWnznftwmN31hJDFoqUZXgTIMWT4WkFEdv+aQQWWfi/+ddOpSCbR2 gTHiLI69BWT7AXRw78w3b0kmWdcgVAxkqCKKILZ1p2B3FRkXuBN1zXzie FO/IkydxazcS4Auq+aqpqIO2ojb7+PTwZgBq3Zphj+B0Ew3EQusZ393tj A==; X-CSE-ConnectionGUID: OUsYezKoTd+bA/fwzHNvug== X-CSE-MsgGUID: nOVMlrz7TpqxuzDrwWU5aQ== X-IronPort-AV: E=McAfee;i="6800,10657,11533"; a="69459553" X-IronPort-AV: E=Sophos;i="6.18,213,1751266800"; d="scan'208";a="69459553" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2025 09:35:55 -0700 X-CSE-ConnectionGUID: wGy2mzdEQBu6ep/2AqbnXQ== X-CSE-MsgGUID: NAapVdSxTk+ZacKhIWFZ9w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,213,1751266800"; d="scan'208";a="169241086" Received: from black.igk.intel.com ([10.91.253.5]) by orviesa007.jf.intel.com with ESMTP; 25 Aug 2025 09:35:48 -0700 Received: by black.igk.intel.com (Postfix, from userid 1003) id E1D6697; Mon, 25 Aug 2025 18:35:46 +0200 (CEST) From: Andy Shevchenko To: Helge Deller , Andy Shevchenko , Geert Uytterhoeven , Thomas Fourier , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-block@vger.kernel.org Cc: Richard Henderson , Matt Turner , Ian Molton , Russell King , Thomas Bogendoerfer , "James E.J. Bottomley" , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "David S. Miller" , Andreas Larsson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Denis Efremov , Jens Axboe , Andrew Morton Subject: [PATCH v2 3/3] floppy: Sort headers alphabetically Date: Mon, 25 Aug 2025 18:32:57 +0200 Message-ID: <20250825163545.39303-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250825163545.39303-1-andriy.shevchenko@linux.intel.com> References: <20250825163545.39303-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Sorting headers alphabetically helps locating duplicates, and makes it easier to figure out where to insert new headers. Signed-off-by: Andy Shevchenko --- drivers/block/floppy.c | 54 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index d769a223fcc8..61d62019a38d 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -163,35 +163,35 @@ =20 /* do print messages for unexpected interrupts */ static int print_unex =3D 1; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* CMOS defines */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* CMOS defines */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include =20 /* * PS/2 floppies have much slower step rates than regular floppies. --=20 2.50.1