[parisc-linux] [PATCH] asm-parisc/ide.h cleanup (there are no standard ports)

[Bartlomiej Zolnierkiewicz]

On Saturday 27 of March 2004 23:28, Grant Grundler wrote:
> On Wed, Mar 24, 2004 at 02:43:43PM +0100, Bartlomiej Zolnierkiewicz wrote:
> > Hi,
> >
> > Is this patch correct?
>
> It's not necessary.

Well, I know but I have other cleanups incremental to this one. :-)

> > Regards,
> > Bartlomiej
> >
> >  linux-2.6.5-rc2-bk3-root/include/asm-parisc/ide.h |   15 ++-------------
> >  1 files changed, 2 insertions(+), 13 deletions(-)
> >
> > diff -puN include/asm-parisc/ide.h~parisc_no_default_ide_ports
> > include/asm-parisc/ide.h ---
> > linux-2.6.5-rc2-bk3/include/asm-parisc/ide.h~parisc_no_default_ide_ports	
> >2004-03-24 14:39:06.293991064 +0100 +++
> > linux-2.6.5-rc2-bk3-root/include/asm-parisc/ide.h	2004-03-24
> > 14:39:33.400870192 +0100 @@ -41,19 +41,8 @@ static __inline__ void
> > ide_init_hwif_por
> >  	hw->io_ports[IDE_IRQ_OFFSET] = 0;
> >  }
> >
> > -static __inline__ void ide_init_default_hwifs(void)
> > -{
> > -#ifndef CONFIG_PCI
> > -	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);
> > -	}
> > -#endif
> > -}
> > +/* There are no standard ports. */
> > +static inline void ide_init_default_hwifs(void)	{ ; }
>
> Note the "ifndef CONFIG_PCI" - we only support IDE behind PCI to date.
> ie this function already is "empty" for parisc since PCI must be enabled

It is also NOP for #ifdef CONFIG_PCI (that is the reason for this patch BTW)
since both ide_default_io_base() and ide_default_irq() are defined as '0'.

> when IDE is enabled. Hypothetically someone could add an IDE card
> to a parisc EISA bus (eg 725), not define PCI, and then run the IDE
> in PIO mode since DMA is still kaputt behind our EISA IOMMU.

That would require (at least) passing "ide=base[,ctl,[irq]]" kernel parameter.

Regards,
Bartlomiej