2 files changed, 16 insertions, 12 deletions

diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index 05203ad523f7..8dae59bd05a2 100644
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -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
         { }
 };
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 2236c958aec0..01d98eeb242e 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -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);