Remove obsolete IDE headers
Subsystems (7)
Geert Uytterhoeven
maintainercover Remove obsolete IDE headers
Hi all,
This patch series removes all unused <asm/ide.h> headers and <asm-generic/ide_iops.h>. <asm/ide.h> was still included by 3 PATA drivers for m68k platforms, but without any real need.
The first 5 patches have no dependencies.
The last patch depends on the 3 pata patches.
Thanks for your comments!
Geert Uytterhoeven (9):
ARM: Remove <asm/ide.h>
parisc: Remove <asm/ide.h>
powerpc: Remove <asm/ide.h>
sparc: Remove <asm/ide.h>
asm-generic: Remove ide_iops.h
ata: pata_buddha: Remove #include <asm/ide.h>
ata: pata_falcon: Remove #include <asm/ide.h>
ata: pata_gayle: Remove #include <asm/ide.h>
m68k: Remove <asm/ide.h>
arch/arm/include/asm/ide.h | 24 --------- arch/m68k/include/asm/ide.h | 67 ----------------------- arch/parisc/include/asm/ide.h | 54 ------------------- arch/powerpc/include/asm/ide.h | 18 ------- arch/sparc/include/asm/ide.h | 97 ---------------------------------- drivers/ata/pata_buddha.c | 1 - drivers/ata/pata_falcon.c | 1 - drivers/ata/pata_gayle.c | 1 - include/asm-generic/ide_iops.h | 39 -------------- 9 files changed, 302 deletions(-) delete mode 100644 arch/arm/include/asm/ide.h delete mode 100644 arch/m68k/include/asm/ide.h delete mode 100644 arch/parisc/include/asm/ide.h delete mode 100644 arch/powerpc/include/asm/ide.h delete mode 100644 arch/sparc/include/asm/ide.h delete mode 100644 include/asm-generic/ide_iops.h
Signature · 17 lines
2.34.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernelGeert Uytterhoeven
maintainerPATCH 1/9 ARM: Remove <asm/ide.h>
As of commit b7fb14d3ac63117e ("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.
--- arch/arm/include/asm/ide.h | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 arch/arm/include/asm/ide.h
arch/arm/include/asm/ide.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* arch/arm/include/asm/ide.h -* -* Copyright (C) 1994-1996 Linus Torvalds & authors -*/ - -/* -* This file contains the ARM architecture specific IDE code. -*/ - -#ifndef __ASMARM_IDE_H -#define __ASMARM_IDE_H - -#ifdef __KERNEL__ - -#define __ide_mm_insw (port,addr,len) readsw(port,addr,len) -#define __ide_mm_insl (port,addr,len) readsl(port,addr,len) -#define __ide_mm_outsw (port,addr,len) writesw(port,addr,len) -#define __ide_mm_outsl (port,addr,len) writesl(port,addr,len) - -#endif /* __KERNEL__ */ - -#endif /* __ASMARM_IDE_H */
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Damien Le Moal
maintainerRe: [PATCH 1/9] ARM: Remove <asm/ide.h>
Quoted 4 lines · Geert Uytterhoeven
As of commit
b7fb14d3ac63117e("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>
Looks good to me. All patches are reviewed or acked, except this one. Can I get an ack from arm folks ?
Quoted 35 lines
--- arch/arm/include/asm/ide.h | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 arch/arm/include/asm/ide.harch/arm/include/asm/ide.h deleted +0
-24@@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* arch/arm/include/asm/ide.h -* -* Copyright (C) 1994-1996 Linus Torvalds & authors -*/ - -/* -* This file contains the ARM architecture specific IDE code. -*/ - -#ifndef __ASMARM_IDE_H -#define __ASMARM_IDE_H - -#ifdef __KERNEL__ - -#define __ide_mm_insw (port,addr,len) readsw(port,addr,len) -#define __ide_mm_insl (port,addr,len) readsl(port,addr,len) -#define __ide_mm_outsw (port,addr,len) writesw(port,addr,len) -#define __ide_mm_outsl (port,addr,len) writesl(port,addr,len) - -#endif /* __KERNEL__ */ - -#endif /* __ASMARM_IDE_H */
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 1/9] ARM: Remove <asm/ide.h>
In reply to Geert UytterhoevenQuoted 5 lines · Geert Uytterhoeven
As of commit
b7fb14d3ac63117e("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>---
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 2/9 parisc: Remove <asm/ide.h>
In reply to Geert UytterhoevenAs of commit b7fb14d3ac63117e ("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.
--- arch/parisc/include/asm/ide.h | 54 ----------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 arch/parisc/include/asm/ide.h
arch/parisc/include/asm/ide.h deleted +0 -54
@@ -1,54 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* linux/include/asm-parisc/ide.h -* -* Copyright (C) 1994-1996 Linus Torvalds & authors -*/ - -/* -* This file contains the PARISC architecture specific IDE code. -*/ - -#ifndef __ASM_PARISC_IDE_H -#define __ASM_PARISC_IDE_H - -/* Generic I/O and MEMIO string operations. */ - -#define __ide_insw insw -#define __ide_insl insl -#define __ide_outsw outsw -#define __ide_outsl outsl - -static __inline__void __ide_mm_insw (void __iomem *port,void *addr,u32 count) -{ -while (count--) { - *(u16 *)addr =__raw_readw (port); - addr +=2 ; - } -} - -static __inline__void __ide_mm_insl (void __iomem *port,void *addr,u32 count) -{ -while (count--) { - *(u32 *)addr =__raw_readl (port); - addr +=4 ; - } -} - -static __inline__void __ide_mm_outsw (void __iomem *port,void *addr,u32 count) -{ -while (count--) { -__raw_writew (*(u16 *)addr, port); - addr +=2 ; - } -} - -static __inline__void __ide_mm_outsl (void __iomem *port,void *addr,u32 count) -{ -while (count--) { -__raw_writel (*(u32 *)addr, port); - addr +=4 ; - } -} - -#endif /* __ASM_PARISC_IDE_H */
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/9] parisc: Remove <asm/ide.h>
Quoted 4 lines · Geert Uytterhoeven
As of commit
b7fb14d3ac63117e("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>
Thanks!
Helge
Quoted 5 lines
--- arch/parisc/include/asm/ide.h | 54 ----------------------------------- 1 file changed, 54 deletions(-)delete mode 100644
arch/parisc/include/asm/ide.h
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 3/9 powerpc: Remove <asm/ide.h>
In reply to Geert UytterhoevenAs of commit b7fb14d3ac63117e ("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.
--- arch/powerpc/include/asm/ide.h | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 arch/powerpc/include/asm/ide.h
arch/powerpc/include/asm/ide.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 1994-1996 Linus Torvalds & authors -* -* This file contains the powerpc architecture specific IDE code. -*/ -#ifndef _ASM_POWERPC_IDE_H -#define _ASM_POWERPC_IDE_H - -#include <linux/compiler.h> -#include <asm/io.h> - -#define __ide_mm_insw (p, a, c) readsw((void __iomem *)(p), (a), (c)) -#define __ide_mm_insl (p, a, c) readsl((void __iomem *)(p), (a), (c)) -#define __ide_mm_outsw (p, a, c) writesw((void __iomem *)(p), (a), (c)) -#define __ide_mm_outsl (p, a, c) writesl((void __iomem *)(p), (a), (c)) - -#endif /* _ASM_POWERPC_IDE_H */
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 3/9] powerpc: Remove <asm/ide.h>
Quoted 8 lines · Geert Uytterhoeven
As of commit
b7fb14d3ac63117e("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>--- arch/powerpc/include/asm/ide.h | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 arch/powerpc/include/asm/ide.h
cheers
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 4/9 sparc: Remove <asm/ide.h>
In reply to Geert UytterhoevenAs of commit b7fb14d3ac63117e ("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.
--- arch/sparc/include/asm/ide.h | 97 ------------------------------------ 1 file changed, 97 deletions(-) delete mode 100644 arch/sparc/include/asm/ide.h
arch/sparc/include/asm/ide.h deleted +0 -97
@@ -1,97 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* ide.h: SPARC PCI specific IDE glue. -* -* Copyright (C) 1997 David S. Miller ([email protected]) -* Copyright (C) 1998 Eddie C. Dost ([email protected]) -* Adaptation from sparc64 version to sparc by Pete Zaitcev. -*/ - -#ifndef _SPARC_IDE_H -#define _SPARC_IDE_H - -#ifdef __KERNEL__ - -#include <asm/io.h> -#ifdef CONFIG_SPARC64 -#include <asm/spitfire.h> -#include <asm/cacheflush.h> -#include <asm/page.h> -#else -#include <linux/pgtable.h> -#include <asm/psr.h> -#endif - -#define __ide_insl (data_reg, buffer, wcount) \ - __ide_insw(data_reg, buffer, (wcount)<<1) -#define __ide_outsl (data_reg, buffer, wcount) \ - __ide_outsw(data_reg, buffer, (wcount)<<1) - -/* On sparc, I/O ports and MMIO registers are accessed identically. */ -#define __ide_mm_insw __ide_insw -#define __ide_mm_insl __ide_insl -#define __ide_mm_outsw __ide_outsw -#define __ide_mm_outsl __ide_outsl - -static inline void __ide_insw (void __iomem *port,void *dst,u32 count) -{ -#if defined(CONFIG_SPARC64 ) && defined(DCACHE_ALIASING_POSSIBLE ) -unsigned long end = (unsigned long )dst + (count <<1 ); -#endif -u16 *ps = dst; -u32 *pi; - -if (((unsigned long )ps) &0x2 ) { - *ps++ =__raw_readw (port); - count--; - } - pi = (u32 *)ps; -while (count >=2 ) { -u32 w; - - w =__raw_readw (port) <<16 ; - w |=__raw_readw (port); - *pi++ = w; - count -=2 ; - } - ps = (u16 *)pi; -if (count) - *ps++ =__raw_readw (port); - -#if defined(CONFIG_SPARC64 ) && defined(DCACHE_ALIASING_POSSIBLE ) -__flush_dcache_range ((unsigned long )dst, end); -#endif -} - -static inline void __ide_outsw (void __iomem *port,const void *src,u32 count) -{ -#if defined(CONFIG_SPARC64 ) && defined(DCACHE_ALIASING_POSSIBLE ) -unsigned long end = (unsigned long )src + (count <<1 ); -#endif -const u16 *ps = src; -const u32 *pi; - -if (((unsigned long )src) &0x2 ) { -__raw_writew (*ps++, port); - count--; - } - pi = (const u32 *)ps; -while (count >=2 ) { -u32 w; - - w = *pi++; -__raw_writew ((w >>16 ), port); -__raw_writew (w, port); - count -=2 ; - } - ps = (const u16 *)pi; -if (count) -__raw_writew (*ps, port); - -#if defined(CONFIG_SPARC64 ) && defined(DCACHE_ALIASING_POSSIBLE ) -__flush_dcache_range ((unsigned long )src, end); -#endif -} - -#endif /* __KERNEL__ */ - -#endif /* _SPARC_IDE_H */
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 4/9] sparc: Remove <asm/ide.h>
Quoted 4 lines · Geert Uytterhoeven
As of commit
b7fb14d3ac63117e("ide: remove the legacy ide driver") in v5.14, there are no more generic users of <asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>
Geert Uytterhoeven
maintainerPATCH 5/9 asm-generic: Remove ide_iops.h
In reply to Geert UytterhoevenThe last user of ide_iops.h was removed in commit b7fb14d3ac63117e ("ide: remove the legacy ide driver") in v5.14.
--- include/asm-generic/ide_iops.h | 39 ---------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 include/asm-generic/ide_iops.h
include/asm-generic/ide_iops.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Generic I/O and MEMIO string operations. */ - -#define __ide_insw insw -#define __ide_insl insl -#define __ide_outsw outsw -#define __ide_outsl outsl - -static __inline__void __ide_mm_insw (void __iomem *port,void *addr,u32 count) -{ -while (count--) { - *(u16 *)addr =readw (port); - addr +=2 ; - } -} - -static __inline__void __ide_mm_insl (void __iomem *port,void *addr,u32 count) -{ -while (count--) { - *(u32 *)addr =readl (port); - addr +=4 ; - } -} - -static __inline__void __ide_mm_outsw (void __iomem *port,void *addr,u32 count) -{ -while (count--) { -writew (*(u16 *)addr, port); - addr +=2 ; - } -} - -static __inline__void __ide_mm_outsl (void __iomem * port,void *addr,u32 count) -{ -while (count--) { -writel (*(u32 *)addr, port); - addr +=4 ; - } -}
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 5/9] asm-generic: Remove ide_iops.h
Quoted 7 lines · Geert Uytterhoeven
The last user of
ide_iops.hwas removed in commitb7fb14d3ac63117e("ide: remove the legacy ide driver") in v5.14.Signed-off-by Geert Uytterhoeven <[email protected]>--- include/asm-generic/ide_iops.h | 39 ---------------------------------- 1 file changed, 39 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 6/9 ata: pata_buddha: Remove #include <asm/ide.h>
In reply to Geert UytterhoevenThe Buddha, Catweasel, and X-Surf PATA driver does not need anything from <asm/ide.h>.
--- drivers/ata/pata_buddha.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/pata_buddha.c +0 -1
@@ -27,7 +27,6 @@#include <asm/amigahw.h> #include <asm/amigaints.h> -#include <asm/ide.h> #include <asm/setup.h> #define DRV_NAME "pata_buddha"
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 6/9] ata: pata_buddha: Remove #include <asm/ide.h>
Quoted 4 lines · Geert Uytterhoeven
The Buddha, Catweasel, and X-Surf PATA driver does not need anything from <
asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>
[...]
MBR, Sergey
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 7/9 ata: pata_falcon: Remove #include <asm/ide.h>
In reply to Geert UytterhoevenThe Atari Falcon PATA driver does not need anything from <asm/ide.h>.
--- drivers/ata/pata_falcon.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/pata_falcon.c +0 -1
@@ -28,7 +28,6 @@#include <asm/atarihw.h> #include <asm/atariints.h> #include <asm/atari_stdma.h> -#include <asm/ide.h> #define DRV_NAME "pata_falcon"#define DRV_VERSION "0.1.0"
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 7/9] ata: pata_falcon: Remove #include <asm/ide.h>
Quoted 3 lines · Geert Uytterhoeven
The Atari Falcon PATA driver does not need anything from <
asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>
[...]
MBR, Sergey
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 8/9 ata: pata_gayle: Remove #include <asm/ide.h>
In reply to Geert UytterhoevenThe Amiga Gayle PATA driver does not need anything from <asm/ide.h>.
--- drivers/ata/pata_gayle.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/pata_gayle.c +0 -1
@@ -27,7 +27,6 @@#include <asm/amigahw.h> #include <asm/amigaints.h> #include <asm/amigayle.h> -#include <asm/ide.h> #include <asm/setup.h> #define DRV_NAME "pata_gayle"
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 8/9] ata: pata_gayle: Remove #include <asm/ide.h>
Quoted 3 lines · Geert Uytterhoeven
The Amiga Gayle PATA driver does not need anything from <
asm/ide.h>.Signed-off-by Geert Uytterhoeven <[email protected]>
[...]
MBR, Sergey
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Geert Uytterhoeven
maintainerPATCH 9/9 m68k: Remove <asm/ide.h>
In reply to Geert UytterhoevenThere are no more users of <asm/ide.h>.
--- arch/m68k/include/asm/ide.h | 67 ------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 arch/m68k/include/asm/ide.h
arch/m68k/include/asm/ide.h deleted +0 -67
@@ -1,67 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 1994-1996 Linus Torvalds & authors -*/ - -/* Copyright(c) 1996 Kars de Jong */ -/* Based on the ide driver from 1.2.13pl8 */ - -/* -* Credits (alphabetical): -* -* - Bjoern Brauel -* - Kars de Jong -* - Torsten Ebeling -* - Dwight Engen -* - Thorsten Floeck -* - Roman Hodek -* - Guenther Kelleter -* - Chris Lawrence -* - Michael Rausch -* - Christian Sauer -* - Michael Schmitz -* - Jes Soerensen -* - Michael Thurm -* - Geert Uytterhoeven -*/ - -#ifndef _M68K_IDE_H -#define _M68K_IDE_H - -#ifdef __KERNEL__ -#include <asm/setup.h> -#include <asm/io.h> -#include <asm/irq.h> - -#ifdef CONFIG_MMU - -/* -* Get rid of defs from io.h - ide has its private and conflicting versions -* Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we -* always use the `raw' MMIO versions -*/ -#undef readb -#undef readw -#undef writeb -#undef writew - -#define readb in_8 -#define readw in_be16 -#define __ide_mm_insw (port, addr, n) raw_insw((u16 *)port, addr, n) -#define __ide_mm_insl (port, addr, n) raw_insl((u32 *)port, addr, n) -#define writeb (val, port) out_8(port, val) -#define writew (val, port) out_be16(port, val) -#define __ide_mm_outsw (port, addr, n) raw_outsw((u16 *)port, addr, n) -#define __ide_mm_outsl (port, addr, n) raw_outsl((u32 *)port, addr, n) - -#else - -#define __ide_mm_insw (port, addr, n) io_insw((unsigned int)port, addr, n) -#define __ide_mm_insl (port, addr, n) io_insl((unsigned int)port, addr, n) -#define __ide_mm_outsw (port, addr, n) io_outsw((unsigned int)port, addr, n) -#define __ide_mm_outsl (port, addr, n) io_outsl((unsigned int)port, addr, n) - -#endif /* CONFIG_MMU */ - -#endif /* __KERNEL__ */ -#endif /* _M68K_IDE_H */
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 11 lines · Geert Uytterhoeven
Hi all,
This patch series removes all unused <
asm/ide.h> headers and <asm-generic/ide_iops.h>. <asm/ide.h> was still included by 3 PATA drivers for m68k platforms, but without any real need.The first 5 patches have no dependencies.
The last patch depends on the 3 pata patches.Thanks for your comments!
Quoted 10 lines
Geert Uytterhoeven (9):
ARM: Remove <asm/ide.h>
parisc: Remove <asm/ide.h>
powerpc: Remove <asm/ide.h>
sparc: Remove <asm/ide.h>
asm-generic: Removeide_iops.h
ata:pata_buddha: Remove #include <asm/ide.h>
ata:pata_falcon: Remove #include <asm/ide.h>
ata:pata_gayle: Remove #include <asm/ide.h>
m68k: Remove <asm/ide.h>
Applied to libata for-6.6. Thanks !
Signature · 8 lines
Damien Le Moal Western Digital Research _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel