Skip to contentSkip to conversation

staging: dgnc: fix long lines in PCI device table

PATCH Superseded Krzysztof Adamski 2 participants 3 messages Jan 22, 2015 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: dgnc: fix long lines in PCI device table

This patch fixes coding style of PCI device table declaration.

---
drivers/staging/dgnc/dgnc_driver.c | 10 +++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/dgnc/dgnc_driver.c +0 -0
index f610ae1..f04a693 100644
@@ -98,11 +98,11 @@ static struct timer_list dgnc_poll_timer;
 
 

static struct pci_device_id dgnc_pci_tbl[] = {
- { DIGI_VID, PCI_DEVICE_CLASSIC_4_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
- { DIGI_VID, PCI_DEVICE_CLASSIC_8_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
- { DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
- {0,} /* 0 terminated list. */
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID), .driver_data = 0},
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_DID), .driver_data = 2},
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID), .driver_data = 3},
+ {0,}
};
MODULE_DEVICE_TABLE(pci, dgnc_pci_tbl);

Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 1 line · Krzysztof Adamski

This patch fixes coding style of PCI device table declaration.

[]

drivers/staging/dgnc/dgnc_driver.c

Quoted 1 line
drivers/staging/dgnc/dgnc_driver.c +0 -0

[]

drivers/staging/dgnc/dgnc_driver.c static struct timer_list dgnc_poll_timer; · line 100

Quoted 4 lines
drivers/staging/dgnc/dgnc_driver.c +0 -0
@@ -98,11 +98,11 @@ static struct timer_list dgnc_poll_timer;
 
 
 static struct pci_device_id dgnc_pci_tbl[] = {

const

drivers/staging/dgnc/dgnc_driver.c static struct timer_list dgnc_poll_timer; · line 105

Quoted 10 lines
drivers/staging/dgnc/dgnc_driver.c +5 -5
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_4_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	0 },
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	1 },
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_8_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	2 },
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	3 },
-	{0,}						/* 0 terminated list. */
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID), .driver_data = 0},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_DID), .driver_data = 2},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID), .driver_data = 3},
+	{0,}

Maybe better to keep the alignment of .driver_data

+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID), .driver_data = 0},
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_DID), .driver_data = 2},
+ {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID), .driver_data = 3},

#2 lore raw
Quoted 26 lines · Joe Perches
Quoted 1 line · Krzysztof Adamski

This patch fixes coding style of PCI device table declaration.

[]

drivers/staging/dgnc/dgnc_driver.c

Quoted 1 line
drivers/staging/dgnc/dgnc_driver.c +0 -0

[]

drivers/staging/dgnc/dgnc_driver.c static struct timer_list dgnc_poll_timer; · line 100

Quoted 4 lines
drivers/staging/dgnc/dgnc_driver.c +0 -0
@@ -98,11 +98,11 @@ static struct timer_list dgnc_poll_timer;
 
 
 static struct pci_device_id dgnc_pci_tbl[] = {

const

drivers/staging/dgnc/dgnc_driver.c static struct timer_list dgnc_poll_timer; · line 105

Quoted 10 lines
drivers/staging/dgnc/dgnc_driver.c +5 -5
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_4_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	0 },
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	1 },
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_8_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	2 },
-	{	DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,	3 },
-	{0,}						/* 0 terminated list. */
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID), .driver_data = 0},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_DID), .driver_data = 2},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID), .driver_data = 3},
+	{0,}

Maybe better to keep the alignment of .driver_data

Review

Quoted 4 lines
(quoted diff) +4 -0
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID),     .driver_data = 0},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_DID),     .driver_data = 2},
+	{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_8_422_DID), .driver_data = 3},

Good idea, looks better this way, I'll resend.