4 files changed, 19 insertions, 41 deletions

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 06ba90c211a5..619153138986 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1314,6 +1314,13 @@
 
 #define PCI_VENDOR_ID_CREATIVE          0x1102 /* duplicate: ECTIVA */
 #define PCI_DEVICE_ID_CREATIVE_EMU10K1  0x0002
+#define PCI_DEVICE_ID_CREATIVE_20K1     0x0005
+#define PCI_DEVICE_ID_CREATIVE_20K2     0x000b
+#define PCI_SUBDEVICE_ID_CREATIVE_SB0760        0x0024
+#define PCI_SUBDEVICE_ID_CREATIVE_SB08801       0x0041
+#define PCI_SUBDEVICE_ID_CREATIVE_SB08802       0x0042
+#define PCI_SUBDEVICE_ID_CREATIVE_SB08803       0x0043
+#define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX       0x6000
 
 #define PCI_VENDOR_ID_ECTIVA            0x1102 /* duplicate: CREATIVE */
 #define PCI_DEVICE_ID_ECTIVA_EV1938     0x8938
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 5f35374863fb..073fe2a59dae 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -18,7 +18,6 @@
 #include "ctatc.h"
 #include "ctpcm.h"
 #include "ctmixer.h"
-#include "ctdrv.h"
 #include "cthardware.h"
 #include "ctsrc.h"
 #include "ctamixer.h"
@@ -40,23 +39,25 @@
                             | ((IEC958_AES3_CON_FS_48000) << 24))
 
 static const struct ct_atc_chip_sub_details atc_sub_details[NUM_CTCARDS] = {
-        [CTSB0760] = {.subsys = PCI_SUBSYS_CREATIVE_SB0760,
+        [CTSB0760] = {.subsys = PCI_SUBDEVICE_ID_CREATIVE_SB0760,
                       .nm_model = "SB076x"},
-        [CTHENDRIX] = {.subsys = PCI_SUBSYS_CREATIVE_HENDRIX,
+        [CTHENDRIX] = {.subsys = PCI_SUBDEVICE_ID_CREATIVE_HENDRIX,
                       .nm_model = "Hendrix"},
-        [CTSB08801] = {.subsys = PCI_SUBSYS_CREATIVE_SB08801,
+        [CTSB08801] = {.subsys = PCI_SUBDEVICE_ID_CREATIVE_SB08801,
                       .nm_model = "SB0880"},
-        [CTSB08802] = {.subsys = PCI_SUBSYS_CREATIVE_SB08802,
+        [CTSB08802] = {.subsys = PCI_SUBDEVICE_ID_CREATIVE_SB08802,
                       .nm_model = "SB0880"},
-        [CTSB08803] = {.subsys = PCI_SUBSYS_CREATIVE_SB08803,
+        [CTSB08803] = {.subsys = PCI_SUBDEVICE_ID_CREATIVE_SB08803,
                       .nm_model = "SB0880"}
 };
 
 static struct ct_atc_chip_details atc_chip_details[] = {
-        {.vendor = PCI_VENDOR_CREATIVE, .device = PCI_DEVICE_CREATIVE_20K1,
+        {.vendor = PCI_VENDOR_ID_CREATIVE,
+         .device = PCI_DEVICE_ID_CREATIVE_20K1,
          .sub_details = NULL,
          .nm_card = "X-Fi 20k1"},
-        {.vendor = PCI_VENDOR_CREATIVE, .device = PCI_DEVICE_CREATIVE_20K2,
+        {.vendor = PCI_VENDOR_ID_CREATIVE,
+         .device = PCI_DEVICE_ID_CREATIVE_20K2,
          .sub_details = atc_sub_details,
          .nm_card = "X-Fi 20k2"},
         {} /* terminator */
diff --git a/sound/pci/ctxfi/ctdrv.h b/sound/pci/ctxfi/ctdrv.h
deleted file mode 100644
index f776a44f52cf..000000000000
--- a/sound/pci/ctxfi/ctdrv.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.
- *
- * This source file is released under GPL v2 license (no other versions).
- * See the COPYING file included in the main directory of this source
- * distribution for the license terms and conditions.
- *
- * @file    ctdrv.h
- *
- * @breaf
- * This file contains the definition of card IDs supported by this driver.
- *
- * @author Liu Chun
- *
- */
-
-#ifndef CTDRV_H
-#define CTDRV_H
-
-#define PCI_VENDOR_CREATIVE             0x1102
-#define PCI_DEVICE_CREATIVE_20K1        0x0005
-#define PCI_DEVICE_CREATIVE_20K2        0x000B
-#define PCI_SUBVENDOR_CREATIVE          0x1102
-#define PCI_SUBSYS_CREATIVE_SB0760      0x0024
-#define PCI_SUBSYS_CREATIVE_SB08801     0x0041
-#define PCI_SUBSYS_CREATIVE_SB08802     0x0042
-#define PCI_SUBSYS_CREATIVE_SB08803     0x0043
-#define PCI_SUBSYS_CREATIVE_HENDRIX     0x6000
-
-#endif /* CTDRV_H */
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index f91144036512..b7368fded53c 100644
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -11,10 +11,10 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/moduleparam.h>
+#include <linux/pci_ids.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include "ctatc.h"
-#include "ctdrv.h"
 
 MODULE_AUTHOR("Creative Technology Ltd");
 MODULE_DESCRIPTION("X-Fi driver version 1.03");
@@ -32,8 +32,8 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 static struct pci_device_id ct_pci_dev_ids[] = {
         /* only X-Fi is supported, so... */
-        { PCI_DEVICE(PCI_VENDOR_CREATIVE, PCI_DEVICE_CREATIVE_20K1) },
-        { PCI_DEVICE(PCI_VENDOR_CREATIVE, PCI_DEVICE_CREATIVE_20K2) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K1) },
+        { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K2) },
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, ct_pci_dev_ids);