Skip to contentSkip to conversation

IDE: Coding Style fixes to drivers/ide/pci/generic.c

PATCH In review Paolo Ciarrocchi 4 participants 6 messages Feb 23, 2008 – Feb 26, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 8/10 IDE: Coding Style fixes to drivers/ide/pci/generic.c

File is now error free.
Compile tested.

---
 drivers/ide/pci/generic.c |   50 ++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 25 deletions(-)
drivers/ide/pci/generic.c +25 -25
index f83afa1..f9a5879 100644
@@ -49,21 +49,21 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
 
 	{	/* 1 */
 		.name		= "NS87410",
-		.enablebits	= {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
+		.enablebits	= { {0x43, 0x08, 0x08}, {0x47, 0x08, 0x08} },
 		.host_flags	= IDE_HFLAG_TRUST_BIOS_FOR_DMA,
 		.swdma_mask	= ATA_SWDMA2,
 		.mwdma_mask	= ATA_MWDMA2,
 		.udma_mask	= ATA_UDMA6,
 	},
 
-	/*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI",	0),
-	/*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565",	0),
-	/*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",	IDE_HFLAGS_UMC),
-	/*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",	IDE_HFLAGS_UMC),
-	/*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",	IDE_HFLAGS_UMC),
-	/*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE",	0),
-	/*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE",	IDE_HFLAG_NO_AUTODMA),
-	/*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V",	IDE_HFLAG_NO_AUTODMA),
+	/*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI", 0),
+	/*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565", 0),
+	/*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F", IDE_HFLAGS_UMC),
+	/*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A", IDE_HFLAGS_UMC),
+	/*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF", IDE_HFLAGS_UMC),
+	/*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE", 0),
+	/*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE", IDE_HFLAG_NO_AUTODMA),
+	/*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V", IDE_HFLAG_NO_AUTODMA),
 
 	{	/* 10 */
 		.name		= "VIA8237SATA",
@@ -89,7 +89,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
 	}
 };
 
-/**
+/*
  *	generic_init_one	-	called when a PIIX is found
  *	@dev: the generic device
  *	@id: the matching pci id
@@ -97,7 +97,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
  *	Called when the PCI registration layer (or the IDE initialization)
  *	finds a device matching our IDE device tables.
  */
- 
+
 static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
 	const struct ide_port_info *d = &generic_chipsets[id->driver_data];
@@ -145,22 +145,22 @@ out:
 }
 
 static const struct pci_device_id generic_pci_tbl[] = {
-	{ PCI_VDEVICE(NS,	PCI_DEVICE_ID_NS_87410),		 1 },
-	{ PCI_VDEVICE(PCTECH,	PCI_DEVICE_ID_PCTECH_SAMURAI_IDE),	 2 },
-	{ PCI_VDEVICE(HOLTEK,	PCI_DEVICE_ID_HOLTEK_6565),		 3 },
-	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8673F),		 4 },
-	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886A),		 5 },
-	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886BF),		 6 },
-	{ PCI_VDEVICE(HINT,	PCI_DEVICE_ID_HINT_VXPROII_IDE),	 7 },
-	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_82C561),		 8 },
-	{ PCI_VDEVICE(OPTI,	PCI_DEVICE_ID_OPTI_82C558),		 9 },
+	{ PCI_VDEVICE(NS,	PCI_DEVICE_ID_NS_87410), 1 },
+	{ PCI_VDEVICE(PCTECH,	PCI_DEVICE_ID_PCTECH_SAMURAI_IDE), 2 },
+	{ PCI_VDEVICE(HOLTEK,	PCI_DEVICE_ID_HOLTEK_6565), 3 },
+	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8673F), 4 },
+	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886A), 5 },
+	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886BF), 6 },
+	{ PCI_VDEVICE(HINT,	PCI_DEVICE_ID_HINT_VXPROII_IDE), 7 },
+	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_82C561), 8 },
+	{ PCI_VDEVICE(OPTI,	PCI_DEVICE_ID_OPTI_82C558), 9 },
 #ifdef CONFIG_BLK_DEV_IDE_SATA
-	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_8237_SATA),		10 },
+	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_8237_SATA), 10 },
 #endif
-	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO),		11 },
-	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_1),	12 },
-	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),	13 },
-	{ PCI_VDEVICE(NETCELL,	PCI_DEVICE_ID_REVOLUTION),		14 },
+	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO),	11 },
+	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), 12 },
+	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), 13 },
+	{ PCI_VDEVICE(NETCELL,	PCI_DEVICE_ID_REVOLUTION), 14 },
 	/*
 	 * Must come last.  If you add entries adjust
 	 * this table and generic_chipsets[] appropriately.
Signature · 1 line
1.5.4.2.316.gf7a7
#1 lore raw
Quoted 21 lines · Paolo Ciarrocchi

File is now error free.
Compile tested.

---
 drivers/ide/pci/generic.c |   50 ++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 25 deletions(-)
drivers/ide/pci/generic.c +0 -7
index f83afa1..f9a5879 100644
...
-	/*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI",	0),
-	/*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565",	0),
-	/*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",	IDE_HFLAGS_UMC),
-	/*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",	IDE_HFLAGS_UMC),
-	/*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",	IDE_HFLAGS_UMC),
-	/*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE",	0),
-	/*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE",	IDE_HFLAG_NO_AUTODMA),

drivers/ide/pci/generic.c static const struct ide_port_info generic_chipsets[] __devinitdata = { · line 66

Quoted 10 lines
drivers/ide/pci/generic.c +8 -1
-	/*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V",	IDE_HFLAG_NO_AUTODMA),
+	/*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI", 0),
+	/*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565", 0),
+	/*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F", IDE_HFLAGS_UMC),
+	/*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A", IDE_HFLAGS_UMC),
+	/*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF", IDE_HFLAGS_UMC),
+	/*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE", 0),
+	/*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE", IDE_HFLAG_NO_AUTODMA),
+	/*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V", IDE_HFLAG_NO_AUTODMA),
...

I do not even see checkpatch complaining about this, and even if it did your patch would make the code _less_ readable.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#2 lore raw
In reply to Paolo Ciarrocchi

[Paolo Ciarrocchi - Sat, Feb 23, 2008 at 03:05:47PM +0100]

| File is now error free.
| Compile tested.
| 
| 
| Signed-off-by: Paolo Ciarrocchi <[email protected]>
| ---
|  drivers/ide/pci/generic.c |   50 ++++++++++++++++++++++----------------------
|  1 files changed, 25 insertions(+), 25 deletions(-)
| 
| diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
| index f83afa1..f9a5879 100644
| --- a/drivers/ide/pci/generic.c
| +++ b/drivers/ide/pci/generic.c
| @@ -49,21 +49,21 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
|  
|  	{	/* 1 */
|  		.name		= "NS87410",
| -		.enablebits	= {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
| +		.enablebits	= { {0x43, 0x08, 0x08}, {0x47, 0x08, 0x08} },
|  		.host_flags	= IDE_HFLAG_TRUST_BIOS_FOR_DMA,
|  		.swdma_mask	= ATA_SWDMA2,
|  		.mwdma_mask	= ATA_MWDMA2,
|  		.udma_mask	= ATA_UDMA6,
|  	},
|  
| -	/*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI",	0),
| -	/*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565",	0),
| -	/*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",	IDE_HFLAGS_UMC),
| -	/*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",	IDE_HFLAGS_UMC),
| -	/*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",	IDE_HFLAGS_UMC),
| -	/*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE",	0),
| -	/*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE",	IDE_HFLAG_NO_AUTODMA),
| -	/*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V",	IDE_HFLAG_NO_AUTODMA),
| +	/*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI", 0),
| +	/*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565", 0),
| +	/*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F", IDE_HFLAGS_UMC),
| +	/*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A", IDE_HFLAGS_UMC),
| +	/*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF", IDE_HFLAGS_UMC),
| +	/*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE", 0),
| +	/*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE", IDE_HFLAG_NO_AUTODMA),
| +	/*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V", IDE_HFLAG_NO_AUTODMA),
|  
|  	{	/* 10 */
|  		.name		= "VIA8237SATA",
| @@ -89,7 +89,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
|  	}
|  };
|  
| -/**
| +/*

^^^^^^^

Hi Paolo, it seems you just broke kdoc structure

|   *	generic_init_one	-	called when a PIIX is found
|   *	@dev: the generic device
|   *	@id: the matching pci id
| @@ -97,7 +97,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
|   *	Called when the PCI registration layer (or the IDE initialization)
|   *	finds a device matching our IDE device tables.
|   */
| - 
| +
|  static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|  {
|  	const struct ide_port_info *d = &generic_chipsets[id->driver_data];
| @@ -145,22 +145,22 @@ out:
|  }
|  
|  static const struct pci_device_id generic_pci_tbl[] = {
| -	{ PCI_VDEVICE(NS,	PCI_DEVICE_ID_NS_87410),		 1 },
| -	{ PCI_VDEVICE(PCTECH,	PCI_DEVICE_ID_PCTECH_SAMURAI_IDE),	 2 },
| -	{ PCI_VDEVICE(HOLTEK,	PCI_DEVICE_ID_HOLTEK_6565),		 3 },
| -	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8673F),		 4 },
| -	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886A),		 5 },
| -	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886BF),		 6 },
| -	{ PCI_VDEVICE(HINT,	PCI_DEVICE_ID_HINT_VXPROII_IDE),	 7 },
| -	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_82C561),		 8 },
| -	{ PCI_VDEVICE(OPTI,	PCI_DEVICE_ID_OPTI_82C558),		 9 },
| +	{ PCI_VDEVICE(NS,	PCI_DEVICE_ID_NS_87410), 1 },
| +	{ PCI_VDEVICE(PCTECH,	PCI_DEVICE_ID_PCTECH_SAMURAI_IDE), 2 },
| +	{ PCI_VDEVICE(HOLTEK,	PCI_DEVICE_ID_HOLTEK_6565), 3 },
| +	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8673F), 4 },
| +	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886A), 5 },
| +	{ PCI_VDEVICE(UMC,	PCI_DEVICE_ID_UMC_UM8886BF), 6 },
| +	{ PCI_VDEVICE(HINT,	PCI_DEVICE_ID_HINT_VXPROII_IDE), 7 },
| +	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_82C561), 8 },
| +	{ PCI_VDEVICE(OPTI,	PCI_DEVICE_ID_OPTI_82C558), 9 },
|  #ifdef CONFIG_BLK_DEV_IDE_SATA
| -	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_8237_SATA),		10 },
| +	{ PCI_VDEVICE(VIA,	PCI_DEVICE_ID_VIA_8237_SATA), 10 },
|  #endif
| -	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO),		11 },
| -	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_1),	12 },
| -	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),	13 },
| -	{ PCI_VDEVICE(NETCELL,	PCI_DEVICE_ID_REVOLUTION),		14 },
| +	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO),	11 },
| +	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), 12 },
| +	{ PCI_VDEVICE(TOSHIBA,	PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), 13 },
| +	{ PCI_VDEVICE(NETCELL,	PCI_DEVICE_ID_REVOLUTION), 14 },
|  	/*
|  	 * Must come last.  If you add entries adjust
|  	 * this table and generic_chipsets[] appropriately.
| -- 
| 1.5.4.2.316.gf7a7
| 

- Cyrill -

#3 lore raw
Quoted 5 lines

| -/**
| +/*
^^^^^^^

Hi Paolo, it seems you just broke kdoc structure

thank you for your comment, i didn't know that.
Won't happen in future patches.
Bart, can you fix that or do you want me to re-create the series?

Ciao,
--
Paolo
http://paolo.ciarrocchi.googlepages.com/

#4 lore raw

[Paolo Ciarrocchi - Sat, Feb 23, 2008 at 06:07:01PM +0330]

| > | -/**
| > | +/*
| > ^^^^^^^
| >
| > Hi Paolo, it seems you just broke kdoc structure
| 
| thank you for your comment, i didn't know that.
| Won't happen in future patches.

no problem ;)

| Bart, can you fix that or do you want me to re-create the series?
| 
| Ciao,
| --
| Paolo
| http://paolo.ciarrocchi.googlepages.com/
| 

- Cyrill -

#5 lore raw
In reply to Paolo Ciarrocchi
Quoted 9 lines · Paolo Ciarrocchi
Quoted 5 lines

| -/**
| +/*
^^^^^^^

Hi Paolo, it seems you just broke kdoc structure

thank you for your comment, i didn't know that.
Won't happen in future patches.
Bart, can you fix that or do you want me to re-create the series?

I fixed this issue in all patches while merging them.

Thanks,
Bart