Re: [PATCH 3/6] rz1000: apply chipset quirks early

Bartlomiej Zolnierkiewicz
2008-11-09T16:23:31Z

On Tuesday 04 November 2008, Sergei Shtylyov wrote:
> Hello, I wrote:
>
> >> Index: b/drivers/ide/rz1000.c
> >> ===================================================================
> >> --- a/drivers/ide/rz1000.c
> >> +++ b/drivers/ide/rz1000.c
> >> @@ -22,34 +22,48 @@
> >>
> >> #define DRV_NAME "rz1000"
> >>
> >> -static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
> >> +static unsigned int __devinit rz1000_init_chipset(struct pci_dev *dev)
>
> > Hm, this is not a real init_chipset() method and it does just one
> > thing -- disables readahead, so rz1000_disable_readahead() or something
> > of that sort seems like a better name...
>
> Hm, 'unsigned' result type wasn't terribly helpful here as well. :-)

Agreed, v1->v2 interdiff:

...
v2:
* unsigned int rz1000_init_chipset() -> int rz1000_disable_readahead()
per Sergei's suggestion.

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
...
diff -u b/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
--- b/drivers/ide/rz1000.c
+++ b/drivers/ide/rz1000.c
@@ -22,7 +22,7 @@

#define DRV_NAME "rz1000"

-static unsigned int __devinit rz1000_init_chipset(struct pci_dev *dev)
+static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
{
u16 reg;

@@ -52,7 +52,7 @@
if (rc)
return rc;

- if (rz1000_init_chipset(dev)) {
+ if (rz1000_disable_readahead(dev)) {
d.host_flags |= IDE_HFLAG_SERIALIZE;
d.host_flags |= IDE_HFLAG_NO_UNMASK_IRQS;
}