Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438bc9c3 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] sata_vsc: partially revert a PCI ID-related commit 



Partially revert 74d0a988:

	[PATCH] PCI: Move various PCI IDs to header file

libata policy is to avoid use of named PCI device ID constants.
These are often single-use constants, which have little value over
direct numeric constants save for constant include/linux/pci_ids.h
patching/merging headaches.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8676ce07

drivers/scsi/sata_vsc.c

+3 −7
Original line number Diff line number Diff line
@@ -443,16 +443,12 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d 
}





/*

 * Intel 31244 is supposed to be identical.

 * Compatibility is untested as of yet.

 */

static const struct pci_device_id vsc_sata_pci_tbl[] = {

	{ PCI_VENDOR_ID_VITESSE, PCI_DEVICE_ID_VITESSE_VSC7174,

	{ PCI_VENDOR_ID_VITESSE, 0x7174,

	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GD31244,

	{ PCI_VENDOR_ID_INTEL, 0x3200,

	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },

	{ }

	{ }	/* terminate list */

};

include/linux/pci_ids.h

+0 −1
Original line number Diff line number Diff line
@@ -2170,7 +2170,6 @@ 
#define PCI_DEVICE_ID_INTEL_ICH8_4	0x2815

#define PCI_DEVICE_ID_INTEL_ICH8_5	0x283e

#define PCI_DEVICE_ID_INTEL_ICH8_6	0x2850

#define PCI_DEVICE_ID_INTEL_GD31244	0x3200

#define PCI_DEVICE_ID_INTEL_82855PM_HB	0x3340

#define PCI_DEVICE_ID_INTEL_82830_HB	0x3575

#define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577