- extended the preprocessor magic to av7110.c, too, had to change

  the other files again.

5 files changed, 45 insertions, 113 deletions

diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h
index ece57408c..44f3ce2c2 100644
--- a/linux/drivers/media/common/saa7146.h
+++ b/linux/drivers/media/common/saa7146.h
@@ -68,6 +68,15 @@ struct saa7146_pci_extension_data {
 	void *ext_priv;			/* most likely a name string */
 };
 
+#define MAKE_EXTENSION_PCI(x_var, x_vendor, x_device)		\
+	{							\
+		.vendor    = PCI_VENDOR_ID_PHILIPS,		\
+		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,	\
+		.subvendor = x_vendor,				\
+		.subdevice = x_device,				\
+		.driver_data = (unsigned long)& x_var,		\
+	}
+
 struct saa7146_extension
 {
 	char	name[32];		/* name of the device */
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-av.c b/linux/drivers/media/dvb/ttpci-budget/budget-av.c
index 39886ff4f..78c977900 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci-budget/budget-av.c
@@ -43,7 +43,10 @@ MAKE_BUDGET_INFO(knc1, "KNC1 DVB-S", BUDGET_KNC1);
 
 static
 struct pci_device_id devices[] = {
-	MAKE_BUDGET_PCI(knc1, 0x1131, 0x4f56),
+	MAKE_EXTENSION_PCI(knc1, 0x1131, 0x4f56),
+	{
+		.vendor    = 0,
+	}
 };
 
 struct budget_av_data
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.c b/linux/drivers/media/dvb/ttpci-budget/budget.c
index ad5ef61c5..505999dd0 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget.c
+++ b/linux/drivers/media/dvb/ttpci-budget/budget.c
@@ -44,12 +44,15 @@ MAKE_BUDGET_INFO(satel,	"SATELCO Multimedia PCI",	BUDGET_TT_HW_DISEQC);
 
 static
 struct pci_device_id pci_tbl[] = {
-	MAKE_BUDGET_PCI(ttbs, 0x13c2, 0x1003),
-	MAKE_BUDGET_PCI(ttbc, 0x13c2, 0x1004),
-	MAKE_BUDGET_PCI(ttbt, 0x13c2, 0x1005),
-	MAKE_BUDGET_PCI(ttbci, 0x13c2, 0x100f), /* TT_BUDGET_CI without CI (connector not soldered in) */ 
-	MAKE_BUDGET_PCI(ttbci, 0x13c2, 0x100c),
-	MAKE_BUDGET_PCI(satel, 0x13c2, 0x1013),
+	MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1003),
+	MAKE_EXTENSION_PCI(ttbc,  0x13c2, 0x1004),
+	MAKE_EXTENSION_PCI(ttbt,  0x13c2, 0x1005),
+	MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100f), /* TT_BUDGET_CI without CI (connector not soldered in) */ 
+	MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100c),
+	MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
+	{
+		.vendor    = 0,
+	}
 };
 
 static
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.h b/linux/drivers/media/dvb/ttpci-budget/budget.h
index ea66eeb47..ab175b8e7 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget.h
+++ b/linux/drivers/media/dvb/ttpci-budget/budget.h
@@ -74,15 +74,6 @@ static struct saa7146_pci_extension_data x_var = { \
 	.ext_priv = &x_var ## _info, \
 	.ext = &budget_extension };
 
-#define MAKE_BUDGET_PCI(x_var, x_vendor, x_device)		\
-	{							\
-		.vendor    = PCI_VENDOR_ID_PHILIPS,		\
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,	\
-		.subvendor = x_vendor,				\
-		.subdevice = x_device,				\
-		.driver_data = (unsigned long)& x_var,		\
-	}
-
 #define TS_WIDTH  (4*188)
 #define TS_HEIGHT (1024/4)
 #define TS_BUFLEN (TS_WIDTH*TS_HEIGHT)
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index aad57df96..45a60101d 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -4383,106 +4383,32 @@ struct saa7146_standard standard[] = {
 static
 struct saa7146_extension av7110_extension;
 
-static
-struct saa7146_pci_extension_data fs_1_5 = {
-	.ext_priv = "Siemens cable card PCI rev1.5",
-	.ext = &av7110_extension,
-};
-static
-struct saa7146_pci_extension_data fs_1_3 = {
-	.ext_priv = "Siemens/Technotrend/Hauppauge PCI rev1.3",
-	.ext = &av7110_extension,
-};
-static
-struct saa7146_pci_extension_data unkwn = {
-	.ext_priv = "Technotrend/Hauppauge PCI rev?(unknown0)?",
-	.ext = &av7110_extension,
-};
-static
-struct saa7146_pci_extension_data tt_1_6 = {
-	.ext_priv = "Technotrend/Hauppauge PCI rev1.3 or 1.6",
-	.ext = &av7110_extension,
-};
-static
-struct saa7146_pci_extension_data tt_2_1 = {
-	.ext_priv = "Technotrend/Hauppauge PCI rev2.1",
-	.ext = &av7110_extension,
-};
-static
-struct saa7146_pci_extension_data tt_t = {
-	.ext_priv = "Technotrend/Hauppauge PCI DVB-T",
-	.ext = &av7110_extension,
-};
+#define MAKE_AV7110_INFO(x_var,x_name) \
+static struct saa7146_pci_extension_data x_var = { \
+	.ext_priv = x_name, \
+	.ext = &av7110_extension }
+
+MAKE_AV7110_INFO(fs_1_5, "Siemens cable card PCI rev1.5");
+MAKE_AV7110_INFO(fs_1_3, "Siemens/Technotrend/Hauppauge PCI rev1.3");
+MAKE_AV7110_INFO(unkwn,	 "Technotrend/Hauppauge PCI rev?(unknown0)?");
+MAKE_AV7110_INFO(tt_1_6, "Technotrend/Hauppauge PCI rev1.3 or 1.6");
+MAKE_AV7110_INFO(tt_2_1, "Technotrend/Hauppauge PCI rev2.1");
+MAKE_AV7110_INFO(tt_t,	 "Technotrend/Hauppauge PCI DVB-T");
 
 static
 struct pci_device_id pci_tbl[] = {
-	   {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x110a,
-		.subdevice = 0xffff,
-		.driver_data = (unsigned long)&fs_1_5
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x110a,
-		.subdevice = 0x0000,
-		.driver_data = (unsigned long)&fs_1_5
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0000,
-		.driver_data = (unsigned long)&fs_1_3
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x1002,
-		.driver_data = (unsigned long)&unkwn 
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0001,
-		.driver_data = (unsigned long)&tt_1_6
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0002,
-		.driver_data = (unsigned long)&tt_2_1
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0003,
-		.driver_data = (unsigned long)&tt_2_1
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0004,
-		.driver_data = (unsigned long)&tt_2_1
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0006,
-		.driver_data = (unsigned long)&tt_1_6
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0x13c2,
-		.subdevice = 0x0008,
-		.driver_data = (unsigned long)&tt_t
-	}, {
-		.vendor    = PCI_VENDOR_ID_PHILIPS,
-		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
-		.subvendor = 0xffc2,
-		.subdevice = 0x0000,
-		.driver_data = (unsigned long)&unkwn 
-	}, {
+	MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0xffff),
+	MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0x0000),
+	MAKE_EXTENSION_PCI(fs_1_3, 0x13c2, 0x0000),
+	MAKE_EXTENSION_PCI(unkwn,  0x13c2, 0x1002),
+	MAKE_EXTENSION_PCI(tt_1_6, 0x13c2, 0x0001),
+	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0002),
+	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0003),
+	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0004),
+	MAKE_EXTENSION_PCI(tt_1_6, 0x13c2, 0x0006),
+	MAKE_EXTENSION_PCI(tt_t,   0x13c2, 0x0008),
+	MAKE_EXTENSION_PCI(unkwn,  0xffc2, 0x0000),
+	{
 		.vendor    = 0,
 	}
 };