public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: dgnc: fix long lines in PCI device table
@ 2015-01-22 18:55 Krzysztof Adamski
  2015-01-22 19:10 ` Joe Perches
  0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Adamski @ 2015-01-22 18:55 UTC (permalink / raw)
  To: Lidza Louina, Mark Hounschell, Greg Kroah-Hartman
  Cc: driverdev-devel, devel, linux-kernel

This patch fixes coding style of PCI device table declaration.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
---
 drivers/staging/dgnc/dgnc_driver.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index f610ae1..f04a693 100644
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -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);
 
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] staging: dgnc: fix long lines in PCI device table
  2015-01-22 18:55 [PATCH] staging: dgnc: fix long lines in PCI device table Krzysztof Adamski
@ 2015-01-22 19:10 ` Joe Perches
  2015-01-22 19:18   ` Krzysztof Adamski
  0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2015-01-22 19:10 UTC (permalink / raw)
  To: Krzysztof Adamski
  Cc: Lidza Louina, Mark Hounschell, Greg Kroah-Hartman,
	driverdev-devel, devel, linux-kernel

On Thu, 2015-01-22 at 19:55 +0100, Krzysztof Adamski wrote:
> This patch fixes coding style of PCI device table declaration.
[]
> diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
[]
> @@ -98,11 +98,11 @@ static struct timer_list dgnc_poll_timer;
>  
> 
>  static struct pci_device_id dgnc_pci_tbl[] = {

const

> -	{	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},



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] staging: dgnc: fix long lines in PCI device table
  2015-01-22 19:10 ` Joe Perches
@ 2015-01-22 19:18   ` Krzysztof Adamski
  0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Adamski @ 2015-01-22 19:18 UTC (permalink / raw)
  To: Joe Perches
  Cc: Lidza Louina, Mark Hounschell, Greg Kroah-Hartman,
	driverdev-devel, devel, linux-kernel

On Thu, Jan 22, 2015 at 11:10:58AM -0800, Joe Perches wrote:
>On Thu, 2015-01-22 at 19:55 +0100, Krzysztof Adamski wrote:
>> This patch fixes coding style of PCI device table declaration.
>[]
>> diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
>[]
>> @@ -98,11 +98,11 @@ static struct timer_list dgnc_poll_timer;
>>
>>
>>  static struct pci_device_id dgnc_pci_tbl[] = {
>
>const
>
>> -	{	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},
>

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-01-22 19:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-22 18:55 [PATCH] staging: dgnc: fix long lines in PCI device table Krzysztof Adamski
2015-01-22 19:10 ` Joe Perches
2015-01-22 19:18   ` Krzysztof Adamski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox