[PATCH] pci_ids: macros: replace partial with whole symbols (4153812f) · Commits · 戴 / test

drivers/video/cirrusfb.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -275,20 +275,20 @@ static const struct cirrusfb_board_info_rec {

		#ifdef CONFIG_PCI
		#define CHIP(id, btype) \
		{ PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_##id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
		{ PCI_VENDOR_ID_CIRRUS, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }

		static struct pci_device_id cirrusfb_pci_table[] = {
		CHIP( CIRRUS_5436, BT_ALPINE ),
		CHIP( CIRRUS_5434_8, BT_ALPINE ),
		CHIP( CIRRUS_5434_4, BT_ALPINE ),
		CHIP( CIRRUS_5430, BT_ALPINE ), /* GD-5440 has identical id */
		CHIP( CIRRUS_7543, BT_ALPINE ),
		CHIP( CIRRUS_7548, BT_ALPINE ),
		CHIP( CIRRUS_5480, BT_GD5480 ), /* MacPicasso probably */
		CHIP( CIRRUS_5446, BT_PICASSO4 ), /* Picasso 4 is a GD5446 */
		CHIP( CIRRUS_5462, BT_LAGUNA ), /* CL Laguna */
		CHIP( CIRRUS_5464, BT_LAGUNA ), /* CL Laguna 3D */
		CHIP( CIRRUS_5465, BT_LAGUNA ), /* CL Laguna 3DA*/
		CHIP( PCI_DEVICE_ID_CIRRUS_5436, BT_ALPINE ),
		CHIP( PCI_DEVICE_ID_CIRRUS_5434_8, BT_ALPINE ),
		CHIP( PCI_DEVICE_ID_CIRRUS_5434_4, BT_ALPINE ),
		CHIP( PCI_DEVICE_ID_CIRRUS_5430, BT_ALPINE ), /* GD-5440 is same id */
		CHIP( PCI_DEVICE_ID_CIRRUS_7543, BT_ALPINE ),
		CHIP( PCI_DEVICE_ID_CIRRUS_7548, BT_ALPINE ),
		CHIP( PCI_DEVICE_ID_CIRRUS_5480, BT_GD5480 ), /* MacPicasso likely */
		CHIP( PCI_DEVICE_ID_CIRRUS_5446, BT_PICASSO4 ), /* Picasso 4 is 5446 */
		CHIP( PCI_DEVICE_ID_CIRRUS_5462, BT_LAGUNA ), /* CL Laguna */
		CHIP( PCI_DEVICE_ID_CIRRUS_5464, BT_LAGUNA ), /* CL Laguna 3D */
		CHIP( PCI_DEVICE_ID_CIRRUS_5465, BT_LAGUNA ), /* CL Laguna 3DA*/
		{ 0, }
		};
		MODULE_DEVICE_TABLE(pci, cirrusfb_pci_table);

sound/oss/ymfpci.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -107,14 +107,15 @@ static LIST_HEAD(ymf_devs);
		*/

		static struct pci_device_id ymf_id_tbl[] = {
		#define DEV(v, d, data) \
		{ PCI_VENDOR_ID_##v, PCI_DEVICE_ID_##v##_##d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)data }
		DEV (YAMAHA, 724, "YMF724"),
		DEV (YAMAHA, 724F, "YMF724F"),
		DEV (YAMAHA, 740, "YMF740"),
		DEV (YAMAHA, 740C, "YMF740C"),
		DEV (YAMAHA, 744, "YMF744"),
		DEV (YAMAHA, 754, "YMF754"),
		#define DEV(dev, data) \
		{ PCI_VENDOR_ID_YAMAHA, dev, PCI_ANY_ID, PCI_ANY_ID, 0, 0, \
		(unsigned long)data }
		DEV (PCI_DEVICE_ID_YAMAHA_724, "YMF724"),
		DEV (PCI_DEVICE_ID_YAMAHA_724F, "YMF724F"),
		DEV (PCI_DEVICE_ID_YAMAHA_740, "YMF740"),
		DEV (PCI_DEVICE_ID_YAMAHA_740C, "YMF740C"),
		DEV (PCI_DEVICE_ID_YAMAHA_744, "YMF744"),
		DEV (PCI_DEVICE_ID_YAMAHA_754, "YMF754"),
		#undef DEV
		{ }
		};

sound/pci/bt87x.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -761,15 +761,18 @@ static int __devinit snd_bt87x_create(snd_card_t *card,

		#define BT_DEVICE(chip, subvend, subdev, rate) \
		{ .vendor = PCI_VENDOR_ID_BROOKTREE, \
		.device = PCI_DEVICE_ID_BROOKTREE_##chip, \
		.device = chip, \
		.subvendor = subvend, .subdevice = subdev, \
		.driver_data = rate }

		/* driver_data is the default digital_rate value for that device */
		static struct pci_device_id snd_bt87x_ids[] = {
		BT_DEVICE(878, 0x0070, 0x13eb, 32000), /* Hauppauge WinTV series */
		BT_DEVICE(879, 0x0070, 0x13eb, 32000), /* Hauppauge WinTV series */
		BT_DEVICE(878, 0x0070, 0xff01, 44100), /* Viewcast Osprey 200 */
		/* Hauppauge WinTV series */
		BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, 32000),
		/* Hauppauge WinTV series */
		BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, 32000),
		/* Viewcast Osprey 200 */
		BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100),
		{ }
		};
		MODULE_DEVICE_TABLE(pci, snd_bt87x_ids);

Admin message