Skip to contentSkip to conversation

atm: eni: use DEFINE_PCI_DEVICE_TABLE macro

PATCH In review Jingoo Han 2 participants 11 messages Nov 28, 2013

Subsystems (3)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/8 atm: eni: use DEFINE_PCI_DEVICE_TABLE macro

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/eni.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/eni.c +1 -1
index b1955ba..846fc9e 100644
@@ -2283,7 +2283,7 @@ err_disable:
 }
 
 
-static struct pci_device_id eni_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(eni_pci_tbl) = {
 	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },
 	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },
 	{ 0, }
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/8 atm: fore200e: use DEFINE_PCI_DEVICE_TABLE macro

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/fore200e.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/fore200e.c +1 -1
index 204814e..04fd372 100644
@@ -2762,7 +2762,7 @@ static void fore200e_pca_remove_one(struct pci_dev *pci_dev)
 }
 
 
-static struct pci_device_id fore200e_pca_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(fore200e_pca_tbl) = {
     { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_PCA200E, PCI_ANY_ID, PCI_ANY_ID,
       0, 0, (unsigned long) &fore200e_bus[0] },
     { 0, }
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH 3/8 atm: he: use DEFINE_PCI_DEVICE_TABLE macro

In reply to Jingoo Han

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/he.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/he.c +1 -1
index 8557adc..1adb17b 100644
@@ -2851,7 +2851,7 @@ MODULE_PARM_DESC(irq_coalesce, "use interrupt coalescing (default 1)");
 module_param(sdh, bool, 0);
 MODULE_PARM_DESC(sdh, "use SDH framing (default 0)");
 
-static struct pci_device_id he_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(he_pci_tbl) = {
 	{ PCI_VDEVICE(FORE, PCI_DEVICE_ID_FORE_HE), 0 },
 	{ 0, }
 };
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH 4/8 atm: idt77252: use DEFINE_PCI_DEVICE_TABLE macro

In reply to Jingoo Han

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/idt77252.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/idt77252.c +1 -1
index 1bdf104..0f9fc76 100644
@@ -3730,7 +3730,7 @@ err_out_disable_pdev:
 	return err;
 }
 
-static struct pci_device_id idt77252_pci_tbl[] =
+static DEFINE_PCI_DEVICE_TABLE(idt77252_pci_tbl) =
 {
 	{ PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77252), 0 },
 	{ 0, }
Signature · 1 line
1.7.10.4
author
#4 lore raw

PATCH 5/8 atm: iphase: use DEFINE_PCI_DEVICE_TABLE macro

In reply to Jingoo Han

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/iphase.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/iphase.c +1 -1
index 4217f29..87b0b54 100644
@@ -3258,7 +3258,7 @@ static void ia_remove_one(struct pci_dev *pdev)
       	kfree(iadev);
 }
 
-static struct pci_device_id ia_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(ia_pci_tbl) = {
 	{ PCI_VENDOR_ID_IPHASE, 0x0008, PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_IPHASE, 0x0009, PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0,}
Signature · 1 line
1.7.10.4
author
#5 lore raw

PATCH 6/8 atm: lanai: use DEFINE_PCI_DEVICE_TABLE macro

In reply to Jingoo Han

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/lanai.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/lanai.c +1 -1
index fa7d701..1e43693 100644
@@ -2601,7 +2601,7 @@ static int lanai_init_one(struct pci_dev *pci,
 	return result;
 }
 
-static struct pci_device_id lanai_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(lanai_pci_tbl) = {
 	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_LANAI2) },
 	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_LANAIHB) },
 	{ 0, }	/* terminal entry */
Signature · 1 line
1.7.10.4
author
#6 lore raw

PATCH 7/8 atm: nicstar: use DEFINE_PCI_DEVICE_TABLE macro

In reply to Jingoo Han

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/nicstar.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/nicstar.c +1 -1
index 5aca5f4..7353d41 100644
@@ -260,7 +260,7 @@ static void nicstar_remove_one(struct pci_dev *pcidev)
 	kfree(card);
 }
 
-static struct pci_device_id nicstar_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(nicstar_pci_tbl) = {
 	{ PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0 },
 	{0,}			/* terminate list */
 };
Signature · 1 line
1.7.10.4
author
#7 lore raw

PATCH 8/8 atm: solos-pci: use DEFINE_PCI_DEVICE_TABLE macro

In reply to Jingoo Han

This macro is used to create a struct pci_device_id array.

---
 drivers/atm/solos-pci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/solos-pci.c +1 -1
index 32784d1..f718311 100644
@@ -1461,7 +1461,7 @@ static void fpga_remove(struct pci_dev *dev)
 	kfree(card);
 }
 
-static struct pci_device_id fpga_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(fpga_pci_tbl) = {
 	{ 0x10ee, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	{ 0, }
 };
Signature · 1 line
1.7.10.4
author
#9 lore raw
In reply to Jingoo Han
Quoted 4 lines · Jingoo Han

This macro is used to create a struct pci_device_id array.

Please, ignore these patches.
According to the Greg Kroah-Hartman,

"Yeah, and it's a horrid macro that deserves to be removed, please don't use it in more places.

Actually, if you could just remove it, that would be best, sorry, I'm not going to take these patches."

So, I will send the patch to remove 'DEFINE_PCI_DEVICE_TABLE' instead. Sorry for annoying. :-)

Best regards,
Jingoo Han

Quoted 19 lines
---
 drivers/atm/eni.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/eni.c +1 -2
index b1955ba..846fc9e 100644
@@ -2283,7 +2283,7 @@ err_disable:
 }
 
 
-static struct pci_device_id eni_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(eni_pci_tbl) = {
 	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },
 	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },
 	{ 0, }
--

1.7.10.4

maintainer
#10 lore raw

From: Jingoo Han <[email protected]>
Date: Thu, 28 Nov 2013 13:39:44 +0900

Quoted 8 lines · Jingoo Han
Quoted 4 lines

This macro is used to create a struct pci_device_id array.

Please, ignore these patches.
According to the Greg Kroah-Hartman,

...

Ok, but it was also not appropriate to submit these patches because the net-next tree is not open yet.

Thank you.