Skip to contentSkip to conversation

Remove spaces from PCI IDE pci_driver.name field

PATCH Applied Deepak Saxena 6 participants 13 messages Aug 10, 2004

lore
Share & tools
lore

Deepak Saxena

author
#0 lore raw

PATCH 1/1 Remove spaces from PCI IDE pci_driver.name field

Spaces in driver names show up as spaces in sysfs. Annoying. I went ahead and changed ones that don't have spaces to use ${NAME}_IDE so they are all consistent.

Please apply,
~Deepak

Signed-off-by Deepak Saxena <[email protected]>

===== drivers/ide/pci/aec62xx.c 1.22 vs edited =====

drivers/ide/pci/aec62xx.c +1 -1
@@ -540,7 +540,7 @@
 MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "AEC62xx IDE",
+	.name		= "AEC62xx_IDE",
 	.id_table	= aec62xx_pci_tbl,
 	.probe		= aec62xx_init_one,
 };

===== drivers/ide/pci/alim15x3.c 1.25 vs edited =====

drivers/ide/pci/alim15x3.c +1 -1
@@ -893,7 +893,7 @@
 MODULE_DEVICE_TABLE(pci, alim15x3_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "ALI15x3 IDE",
+	.name		= "ALI15x3_IDE",
 	.id_table	= alim15x3_pci_tbl,
 	.probe		= alim15x3_init_one,
 };

===== drivers/ide/pci/amd74xx.c 1.32 vs edited =====

drivers/ide/pci/amd74xx.c +1 -1
@@ -520,7 +520,7 @@
 MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "AMD IDE",
+	.name		= "AMD_IDE",
 	.id_table	= amd74xx_pci_tbl,
 	.probe		= amd74xx_probe,
 };

===== drivers/ide/pci/atiixp.c 1.3 vs edited =====

drivers/ide/pci/atiixp.c +1 -1
@@ -490,7 +490,7 @@
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "ATIIXP IDE",
+	.name		= "ATIIXP_IDE",
 	.id_table	= atiixp_pci_tbl,
 	.probe		= atiixp_init_one,
 };

===== drivers/ide/pci/cmd64x.c 1.23 vs edited =====

drivers/ide/pci/cmd64x.c +1 -1
@@ -760,7 +760,7 @@
 MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "CMD64x IDE",
+	.name		= "CMD64x_IDE",
 	.id_table	= cmd64x_pci_tbl,
 	.probe		= cmd64x_init_one,
 };

===== drivers/ide/pci/cs5520.c 1.11 vs edited =====

drivers/ide/pci/cs5520.c +1 -1
@@ -319,7 +319,7 @@
 MODULE_DEVICE_TABLE(pci, cs5520_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "CyrixIDE",
+	.name		= "Cyrix_IDE",
 	.id_table	= cs5520_pci_tbl,
 	.probe		= cs5520_init_one,
 };

===== drivers/ide/pci/cy82c693.c 1.17 vs edited =====

drivers/ide/pci/cy82c693.c +1 -1
@@ -444,7 +444,7 @@
 MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "Cypress IDE",
+	.name		= "Cypress_IDE",
 	.id_table	= cy82c693_pci_tbl,
 	.probe		= cy82c693_init_one,
 };

===== drivers/ide/pci/generic.c 1.17 vs edited =====

drivers/ide/pci/generic.c +1 -1
@@ -138,7 +138,7 @@
 MODULE_DEVICE_TABLE(pci, generic_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "PCI IDE",
+	.name		= "PCI_IDE",
 	.id_table	= generic_pci_tbl,
 	.probe		= generic_init_one,
 };

===== drivers/ide/pci/hpt34x.c 1.23 vs edited =====

drivers/ide/pci/hpt34x.c +1 -1
@@ -339,7 +339,7 @@
 MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "HPT34x IDE",
+	.name		= "HPT34x_IDE",
 	.id_table	= hpt34x_pci_tbl,
 	.probe		= hpt34x_init_one,
 };

===== drivers/ide/pci/hpt366.c 1.36 vs edited =====

drivers/ide/pci/hpt366.c +1 -1
@@ -1403,7 +1403,7 @@
 MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "HPT366 IDE",
+	.name		= "HPT366_IDE",
 	.id_table	= hpt366_pci_tbl,
 	.probe		= hpt366_init_one,
 };

===== drivers/ide/pci/it8172.c 1.18 vs edited =====

drivers/ide/pci/it8172.c +1 -1
@@ -302,7 +302,7 @@
 MODULE_DEVICE_TABLE(pci, it8172_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "IT8172IDE",
+	.name		= "IT8172_IDE",
 	.id_table	= it8172_pci_tbl,
 	.probe		= it8172_init_one,
 };

===== drivers/ide/pci/ns87415.c 1.19 vs edited =====

drivers/ide/pci/ns87415.c +1 -1
@@ -236,7 +236,7 @@
 MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "NS87415IDE",
+	.name		= "NS87415_IDE",
 	.id_table	= ns87415_pci_tbl,
 	.probe		= ns87415_init_one,
 };

===== drivers/ide/pci/opti621.c 1.18 vs edited =====

drivers/ide/pci/opti621.c +1 -1
@@ -367,7 +367,7 @@
 MODULE_DEVICE_TABLE(pci, opti621_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "Opti621 IDE",
+	.name		= "Opti621_IDE",
 	.id_table	= opti621_pci_tbl,
 	.probe		= opti621_init_one,
 };

===== drivers/ide/pci/pdc202xx_new.c 1.30 vs edited =====

drivers/ide/pci/pdc202xx_new.c +1 -1
@@ -531,7 +531,7 @@
 MODULE_DEVICE_TABLE(pci, pdc202new_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "Promise IDE",
+	.name		= "Promise_IDE",
 	.id_table	= pdc202new_pci_tbl,
 	.probe		= pdc202new_init_one,
 };

===== drivers/ide/pci/pdc202xx_old.c 1.33 vs edited =====

drivers/ide/pci/pdc202xx_old.c +1 -1
@@ -905,7 +905,7 @@
 MODULE_DEVICE_TABLE(pci, pdc202xx_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "Promise Old IDE",
+	.name		= "Promise_Old_IDE",
 	.id_table	= pdc202xx_pci_tbl,
 	.probe		= pdc202xx_init_one,
 };

===== drivers/ide/pci/piix.c 1.33 vs edited =====

drivers/ide/pci/piix.c +1 -1
@@ -803,7 +803,7 @@
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "PIIX IDE",
+	.name		= "PIIX_IDE",
 	.id_table	= piix_pci_tbl,
 	.probe		= piix_init_one,
 };

===== drivers/ide/pci/rz1000.c 1.15 vs edited =====

drivers/ide/pci/rz1000.c +1 -1
@@ -74,7 +74,7 @@
 MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "RZ1000 IDE",
+	.name		= "RZ1000_IDE",
 	.id_table	= rz1000_pci_tbl,
 	.probe		= rz1000_init_one,
 };

===== drivers/ide/pci/sc1200.c 1.19 vs edited =====

drivers/ide/pci/sc1200.c +1 -1
@@ -565,7 +565,7 @@
 MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "SC1200 IDE",
+	.name		= "SC1200_IDE",
 	.id_table	= sc1200_pci_tbl,
 	.probe		= sc1200_init_one,
 	.suspend	= sc1200_suspend,

===== drivers/ide/pci/serverworks.c 1.29 vs edited =====

drivers/ide/pci/serverworks.c +1 -1
@@ -812,7 +812,7 @@
 MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "Serverworks IDE",
+	.name		= "Serverworks_IDE",
 	.id_table	= svwks_pci_tbl,
 	.probe		= svwks_init_one,
 #if 0	/* FIXME: implement */

===== drivers/ide/pci/sgiioc4.c 1.9 vs edited =====

drivers/ide/pci/sgiioc4.c +1 -1
@@ -782,7 +782,7 @@
 MODULE_DEVICE_TABLE(pci, sgiioc4_pci_tbl);
 
 static struct pci_driver driver = {
-	.name = "SGI-IOC4 IDE",
+	.name = "SGI-IOC4_IDE",
 	.id_table = sgiioc4_pci_tbl,
 	.probe = sgiioc4_init_one,
 };

===== drivers/ide/pci/siimage.c 1.32 vs edited =====

drivers/ide/pci/siimage.c +1 -1
@@ -1137,7 +1137,7 @@
 MODULE_DEVICE_TABLE(pci, siimage_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "SiI IDE",
+	.name		= "SiI_IDE",
 	.id_table	= siimage_pci_tbl,
 	.probe		= siimage_init_one,
 };

===== drivers/ide/pci/sis5513.c 1.27 vs edited =====

drivers/ide/pci/sis5513.c +1 -1
@@ -968,7 +968,7 @@
 MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "SIS IDE",
+	.name		= "SIS_IDE",
 	.id_table	= sis5513_pci_tbl,
 	.probe		= sis5513_init_one,
 };

===== drivers/ide/pci/sl82c105.c 1.20 vs edited =====

drivers/ide/pci/sl82c105.c +1 -1
@@ -503,7 +503,7 @@
 MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "W82C105 IDE",
+	.name		= "W82C105_IDE",
 	.id_table	= sl82c105_pci_tbl,
 	.probe		= sl82c105_init_one,
 };

===== drivers/ide/pci/slc90e66.c 1.22 vs edited =====

drivers/ide/pci/slc90e66.c +1 -1
@@ -387,7 +387,7 @@
 MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "SLC90e66 IDE",
+	.name		= "SLC90e66_IDE",
 	.id_table	= slc90e66_pci_tbl,
 	.probe		= slc90e66_init_one,
 };

===== drivers/ide/pci/triflex.c 1.9 vs edited =====

drivers/ide/pci/triflex.c +1 -1
@@ -242,7 +242,7 @@
 MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "TRIFLEX IDE",
+	.name		= "TRIFLEX_IDE",
 	.id_table	= triflex_pci_tbl,
 	.probe		= triflex_init_one,
 };

===== drivers/ide/pci/trm290.c 1.22 vs edited =====

drivers/ide/pci/trm290.c +1 -1
@@ -408,7 +408,7 @@
 MODULE_DEVICE_TABLE(pci, trm290_pci_tbl);
 
 static struct pci_driver driver = {
-	.name		= "TRM290 IDE",
+	.name		= "TRM290_IDE",
 	.id_table	= trm290_pci_tbl,
 	.probe		= trm290_init_one,
 };

===== drivers/ide/pci/via82cxxx.c 1.23 vs edited =====

drivers/ide/pci/via82cxxx.c +1 -1
@@ -632,7 +632,7 @@
 MODULE_DEVICE_TABLE(pci, via_pci_tbl);
 
 static struct pci_driver driver = {
-	.name 		= "VIA IDE",
+	.name 		= "VIA_IDE",
 	.id_table 	= via_pci_tbl,
 	.probe 		= via_init_one,
 };
Signature · 4 lines
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/

"Unlike me, many of you have accepted the situation of your imprisonment and
 will die here like rotten cabbages." - Number 6
#1 lore raw
Quoted 3 lines · Deepak Saxena

Spaces in driver names show up as spaces in sysfs. Annoying. I went ahead and changed ones that don't have spaces to use ${NAME}_IDE so they are all consistent.

I don't see the problem with spaces in the filenames. I do see the problem in changing stuff under people for now reason other than "I don't like it".

The existing format with spaces looks a lot better in all the graphical file managers.

Alan

author
#2 lore raw

On Aug 10 2004, at 01:11, Alan Cox was caught saying:

Quoted 11 lines · Deepak Saxena
Quoted 3 lines

Spaces in driver names show up as spaces in sysfs. Annoying. I went ahead and changed ones that don't have spaces to use ${NAME}_IDE so they are all consistent.

I don't see the problem with spaces in the filenames. I do see the problem in changing stuff under people for now reason other than "I don't like it".

The existing format with spaces looks a lot better in all the graphical file managers.

Files w/o spaces look better and is easier to work with if running from cmd line, but if we ignore the "prettyness" issue, we should at least try to be consistent. Either we have spaces and _all_ driver names are in the format "xxx IDE", "xxx i2c", etc, or we don't allow space at all.

~Deepak

Signature · 4 lines
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/

"Unlike me, many of you have accepted the situation of your imprisonment and
 will die here like rotten cabbages." - Number 6
#3 lore raw
Quoted 5 lines · Deepak Saxena

Files w/o spaces look better and is easier to work with if running from cmd line, but if we ignore the "prettyness" issue, we should at least try to be consistent. Either we have spaces and _all_ driver names are in the format "xxx IDE", "xxx i2c", etc, or we don't allow space at all.

Any command line tool has to be robust for space handling anyway.

Alan

#4 lore raw
Quoted 6 lines · On Aug-10 2004, Tue, 12:52 +0100 Alan Cox <[email protected]> wrote:
Quoted 5 lines

Files w/o spaces look better and is easier to work with if running from cmd line, but if we ignore the "prettyness" issue, we should at least try to be consistent. Either we have spaces and _all_ driver names are in the format "xxx IDE", "xxx i2c", etc, or we don't allow space at all.

Any command line tool has to be robust for space handling anyway.

Sure, but while with a GUI you can click on almost anything, on the command line spaces in filenames have always been a real pain in the ass, so let's not pretend otherwise.

Signature · 1 line
Tomas Szepe <[email protected]>
#5 lore raw
Quoted 3 lines · Tomas Szepe

Sure, but while with a GUI you can click on almost anything, on the command line spaces in filenames have always been a real pain in the ass, so let's not pretend otherwise.

Ever heard of tab completion? Think of it as click for the command line.

Seriously, do you really *prefer* filenames like
Foo_Bar-Baa_Baaz_Quux.mp3?

Lee

#6 lore raw
Quoted 4 lines · On Aug-10 2004, Tue, 12:13 -0400 Lee Revell <[email protected]> wrote:
Quoted 3 lines

Sure, but while with a GUI you can click on almost anything, on the command line spaces in filenames have always been a real pain in the ass, so let's not pretend otherwise.

Ever heard of tab completion? Think of it as click for the command line.

Most completing algorithms are not (cannot be) smart enough to know context, so the escaping they choose is not necessarily appropriate.

Quoted 2 lines

Seriously, do you really *prefer* filenames like
Foo_Bar-Baa_Baaz_Quux.mp3?

Yes, and I don't think I'm alone.

Signature · 1 line
Tomas Szepe <[email protected]>
#7 lore raw
In reply to Lee Revell
Quoted 10 lines · Lee Revell
Quoted 3 lines · Tomas Szepe

Sure, but while with a GUI you can click on almost anything, on the command line spaces in filenames have always been a real pain in the ass, so let's not pretend otherwise.

Ever heard of tab completion? Think of it as click for the command line.

Seriously, do you really *prefer* filenames like
Foo_Bar-Baa_Baaz_Quux.mp3?

Anyone that writes scripts prefers filenames without spaces. It simplifies scripts *and* typing a lot.

Card\ 01
Card\ 02
Cardinal

Now we have to write: cd Ca<tab>\ <tab>1<tab/space>

On the other hand, perhaps /sys should be named 'My computer' :P

Quoted 1 line

Lee

<<V13>>

p.s. I believe upper-lower case is a similar (or worst) 'problem' too, regarding typing.

#8 lore raw
Quoted 12 lines · On Tue, 2004-08-10 at 12:52, V13 wrote:
Quoted 10 lines · Lee Revell
Quoted 3 lines · Tomas Szepe

Sure, but while with a GUI you can click on almost anything, on the command line spaces in filenames have always been a real pain in the ass, so let's not pretend otherwise.

Ever heard of tab completion? Think of it as click for the command line.

Seriously, do you really *prefer* filenames like
Foo_Bar-Baa_Baaz_Quux.mp3?

Quoted 8 lines

Anyone that writes scripts prefers filenames without spaces. It simplifies scripts *and* typing a lot.

Card\ 01
Card\ 02
Cardinal

Now we have to write: cd Ca<tab>\ <tab>1<tab/space>

Eh, anyone who writes perl scripts on the command line doesn't mind surrounding an expression in quotes.

Lee

#9 lore raw
Quoted 16 lines · On Aug-10 2004, Tue, 12:55 -0400 Lee Revell <[email protected]> wrote:
Quoted 15 lines · On Tue, 2004-08-10 at 12:52, V13 wrote:
Quoted 10 lines · Lee Revell
Quoted 3 lines · Tomas Szepe

Sure, but while with a GUI you can click on almost anything, on the command line spaces in filenames have always been a real pain in the ass, so let's not pretend otherwise.

Ever heard of tab completion? Think of it as click for the command line.

Seriously, do you really *prefer* filenames like
Foo_Bar-Baa_Baaz_Quux.mp3?

Anyone that writes scripts prefers filenames without spaces. It simplifies scripts *and* typing a lot.

Quoted 8 lines
Quoted 5 lines

Card\ 01
Card\ 02
Cardinal

Now we have to write: cd Ca<tab>\ <tab>1<tab/space>

Eh, anyone who writes perl scripts on the command line doesn't mind surrounding an expression in quotes.

Except when the quotes are already open.
Let's drop this now, I can see where the thread is leading.

Signature · 1 line
Tomas Szepe <[email protected]>
#10 lore raw
Quoted 5 lines · Tomas Szepe
Quoted 2 lines

Eh, anyone who writes perl scripts on the command line doesn't mind surrounding an expression in quotes.

Except when the quotes are already open.
Let's drop this now, I can see where the thread is leading.

Agreed.

Lee

#11 lore raw
In reply to Alan Cox
Quoted 8 lines · Alan Cox
Quoted 3 lines · Deepak Saxena

Spaces in driver names show up as spaces in sysfs. Annoying. I went ahead and changed ones that don't have spaces to use ${NAME}_IDE so they are all consistent.

I don't see the problem with spaces in the filenames. I do see the problem in changing stuff under people for now reason other than "I don't like it".

We tried to keep spaces out of device and driver names from the very beginning, in 2.5 during the conversion to the driver model, due to the confusion it caused people. It seems that a few have snuck back in. I'm all for consistancy, so I'll apply these patches.

thanks,

greg k-h

Applied
#12 lore raw
In reply to Deepak Saxena
Quoted 6 lines · Deepak Saxena

Spaces in driver names show up as spaces in sysfs. Annoying. I went ahead and changed ones that don't have spaces to use ${NAME}_IDE so they are all consistent.

Please apply,

Applied, thanks.

greg k-h