remove duplicate ids from ata_piix
PATCH 1/1 remove duplicate ids from ata_piix
From: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
--- drivers/ata/ata_piix.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/ata/ata_piix.c +0 -4
@@ -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*/
Quoted 22 lines · Greg KH
From: Greg Kroah-Hartman <[email protected]>
It seems that the
ata_piixdriver 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 <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/ata/ata_piix.c | 4 ---- 1 file changed, 4 deletions(-)drivers/ata/ata_piix.c +0
-0@@ -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 },
drivers/ata/ata_piix.c static const struct pci_device_id piix_p · line 198
Quoted 10 lines
drivers/ata/ata_piix.c +0
-4{ 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
Quoted 6 lines · Greg KH
From: Greg Kroah-Hartman <[email protected]>
It seems that the
ata_piixdriver 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.
Quoted 6 lines
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 <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
manually applied the proper fix, this for spotting this