[PATCH 3.2 62/79] ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b

2014-02-12 Thread Ben Hutchings 
3.2.55-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Myron Stowe 

commit 69fd3157363935b1e052bd76b8f8ec65e494306e upstream.

With the 0x1b4b vendor ID #define in place, convert hard-coded ID
values.

Signed-off-by: Myron Stowe 
Signed-off-by: Bjorn Helgaas 
Acked-by: Jeff Garzik 
Signed-off-by: Ben Hutchings 
---
 drivers/ata/ahci.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -429,17 +429,17 @@ static const struct pci_device_id ahci_p
/* Marvell */
{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },/* 6145 */
{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },/* 6121 */
-   { PCI_DEVICE(0x1b4b, 0x9123),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9123),
  .class = PCI_CLASS_STORAGE_SATA_AHCI,
  .class_mask = 0xff,
  .driver_data = board_ahci_yes_fbs },  /* 88se9128 */
-   { PCI_DEVICE(0x1b4b, 0x9125),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9125),
  .driver_data = board_ahci_yes_fbs },  /* 88se9125 */
-   { PCI_DEVICE(0x1b4b, 0x917a),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),
  .driver_data = board_ahci_yes_fbs },  /* 88se9172 */
-   { PCI_DEVICE(0x1b4b, 0x9192),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),
  .driver_data = board_ahci_yes_fbs },  /* 88se9172 on 
some Gigabyte */
-   { PCI_DEVICE(0x1b4b, 0x91a3),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),
  .driver_data = board_ahci_yes_fbs },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),
  .driver_data = board_ahci_yes_fbs },

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

[PATCH 3.2 62/79] ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b

2014-02-12 Thread Ben Hutchings 
3.2.55-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Myron Stowe myron.st...@redhat.com

commit 69fd3157363935b1e052bd76b8f8ec65e494306e upstream.

With the 0x1b4b vendor ID #define in place, convert hard-coded ID
values.

Signed-off-by: Myron Stowe myron.st...@redhat.com
Signed-off-by: Bjorn Helgaas bhelg...@google.com
Acked-by: Jeff Garzik jgar...@pobox.com
Signed-off-by: Ben Hutchings b...@decadent.org.uk
---
 drivers/ata/ahci.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -429,17 +429,17 @@ static const struct pci_device_id ahci_p
/* Marvell */
{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },/* 6145 */
{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },/* 6121 */
-   { PCI_DEVICE(0x1b4b, 0x9123),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9123),
  .class = PCI_CLASS_STORAGE_SATA_AHCI,
  .class_mask = 0xff,
  .driver_data = board_ahci_yes_fbs },  /* 88se9128 */
-   { PCI_DEVICE(0x1b4b, 0x9125),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9125),
  .driver_data = board_ahci_yes_fbs },  /* 88se9125 */
-   { PCI_DEVICE(0x1b4b, 0x917a),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),
  .driver_data = board_ahci_yes_fbs },  /* 88se9172 */
-   { PCI_DEVICE(0x1b4b, 0x9192),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),
  .driver_data = board_ahci_yes_fbs },  /* 88se9172 on 
some Gigabyte */
-   { PCI_DEVICE(0x1b4b, 0x91a3),
+   { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),
  .driver_data = board_ahci_yes_fbs },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),
  .driver_data = board_ahci_yes_fbs },

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