Re: [PATCH] remove duplicate ids from ata_piix

[Jeff Garzik]

Greg KH wrote:
> From: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> It seems that the ata_piix driver has two duplicate ids, one of them
> with a different 'private' field in it, which was never being used due
> to the match for the device happening on an earlier entry.
>
> This patch removes the duplicates, if this is the correct thing to do in
> this case for the ICH5 device or not, I'll leave to you :)
>
> This duplication was pointed out to me by Kay Sievers <kay.sievers@xxxxxxx>
>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> ---
>  drivers/ata/ata_piix.c |    4 ----
>  1 file changed, 4 deletions(-)
>
> --- gregkh-2.6.orig/drivers/ata/ata_piix.c
> +++ gregkh-2.6/drivers/ata/ata_piix.c
> @@ -191,12 +191,8 @@ static const struct pci_device_id piix_p
>  	/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
>  	{ 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
>  	{ 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
> -	/* Intel ICH5 */
> -	{ 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
>  	/* C-ICH (i810E2) */
>  	{ 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
> -	/* ESB (855GME/875P + 6300ESB) UDMA 100  */
> -	{ 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
>  	/* ICH6 (and 6) (i915) UDMA 100 */
>  	{ 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
>  	/* ICH7/7-R (i945, i975) UDMA 100*/

Both IDs are clearly dups, but ICH5 should support ich_pata_133, so 
you're removing the wrong entry there.

I think the right thing to do is remove the entries that appear near the 
top of the list, but I would like Alan (Mr. PATA) to confirm...

	/* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
	{ 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
-	{ 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
-	{ 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },

Regards,

	Jeff


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