Mailing List Archive: [RFC: 2.6 patch] remove unused ide_init_default

The arm and the cris port both still contained unused
ide_init_default_hwifs() static inline's being removed by this patch.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

include/asm-arm/arch-sa1100/ide.h | 25 -------------------------
include/asm-cris/arch-v10/ide.h | 12 ------------
2 files changed, 37 deletions(-)

--- linux-2.6.17-rc1-mm2-full/include/asm-arm/arch-sa1100/ide.h.old 2006-04-10 21:15:04.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/include/asm-arm/arch-sa1100/ide.h 2006-04-10 21:15:37.000000000 +0200
@@ -49,28 +49,3 @@
*irq = 0;
}

-/*
- * This registers the standard ports for this architecture with the IDE
- * driver.
- */
-static __inline__ void
-ide_init_default_hwifs(void)
-{
- if (machine_is_lart()) {
-#ifdef CONFIG_SA1100_LART
- hw_regs_t hw;
-
- /* Enable GPIO as interrupt line */
- GPDR &= ~LART_GPIO_IDE;
- set_irq_type(LART_IRQ_IDE, IRQT_RISING);
-
- /* set PCMCIA interface timing */
- MECR = 0x00060006;
-
- /* init the interface */
- ide_init_hwif_ports(&hw, PCMCIA_IO_0_BASE + 0x0000, PCMCIA_IO_0_BASE + 0x1000, NULL);
- hw.irq = LART_IRQ_IDE;
- ide_register_hw(&hw);
-#endif
- }
-}
--- linux-2.6.17-rc1-mm2-full/include/asm-cris/arch-v10/ide.h.old 2006-04-10 21:15:47.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/include/asm-cris/arch-v10/ide.h 2006-04-10 21:16:00.000000000 +0200
@@ -77,18 +77,6 @@
hw->io_ports[IDE_IRQ_OFFSET] = 0;
}

-static inline void ide_init_default_hwifs(void)
-{
- hw_regs_t hw;
- int index;
-
- for(index = 0; index < MAX_HWIFS; index++) {
- ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
- hw.irq = ide_default_irq(ide_default_io_base(index));
- ide_register_hw(&hw, NULL);
- }
-}
-
/* some configuration options we don't need */

#undef SUPPORT_VLB_SYNC

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

On Mon, Apr 10, 2006 at 10:39:50PM +0200, Adrian Bunk wrote:
> --- linux-2.6.17-rc1-mm2-full/include/asm-arm/arch-sa1100/ide.h.old 2006-04-10 21:15:04.000000000 +0200
> +++ linux-2.6.17-rc1-mm2-full/include/asm-arm/arch-sa1100/ide.h 2006-04-10 21:15:37.000000000 +0200
> @@ -49,28 +49,3 @@
> *irq = 0;
> }
>
> -/*
> - * This registers the standard ports for this architecture with the IDE
> - * driver.
> - */
> -static __inline__ void
> -ide_init_default_hwifs(void)
> -{
> - if (machine_is_lart()) {
> -#ifdef CONFIG_SA1100_LART
> - hw_regs_t hw;
> -
> - /* Enable GPIO as interrupt line */
> - GPDR &= ~LART_GPIO_IDE;
> - set_irq_type(LART_IRQ_IDE, IRQT_RISING);
> -
> - /* set PCMCIA interface timing */
> - MECR = 0x00060006;
> -
> - /* init the interface */
> - ide_init_hwif_ports(&hw, PCMCIA_IO_0_BASE + 0x0000, PCMCIA_IO_0_BASE + 0x1000, NULL);
> - hw.irq = LART_IRQ_IDE;
> - ide_register_hw(&hw);
> -#endif
> - }
> -}

NAK. Waiting for the LART folk to get off their backsides and submit a
patch to do what's required. Think of the above as merely documentation
for what's required.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/