Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit f4eaa37017a5a68f67ef86729508022c13fb8e6d

Authored by Greg Kroah-Hartman
1 parent 264f48646e
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed 

Also fixes all drivers that set this field.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 32 changed files with 5 additions and 42 deletions Side-by-side Diff

drivers/char/cyclades.c
Diff comments   View file @ f4eaa37
... ... @@ -5250,7 +5250,6 @@
5250 5250 cy_serial_driver->owner = THIS_MODULE;
5251 5251 cy_serial_driver->driver_name = "cyclades";
5252 5252 cy_serial_driver->name = "ttyC";
5253   - cy_serial_driver->devfs_name = "tts/C";
5254 5253 cy_serial_driver->major = CYCLADES_MAJOR;
5255 5254 cy_serial_driver->minor_start = 0;
5256 5255 cy_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
... ... @@ -1232,7 +1232,6 @@
1232 1232  
1233 1233 pc_driver->owner = THIS_MODULE;
1234 1234 pc_driver->name = "ttyD";
1235   - pc_driver->devfs_name = "tts/D";
1236 1235 pc_driver->major = DIGI_MAJOR;
1237 1236 pc_driver->minor_start = 0;
1238 1237 pc_driver->type = TTY_DRIVER_TYPE_SERIAL;
... ... @@ -2449,7 +2449,6 @@
2449 2449  
2450 2450 esp_driver->owner = THIS_MODULE;
2451 2451 esp_driver->name = "ttyP";
2452   - esp_driver->devfs_name = "tts/P";
2453 2452 esp_driver->major = ESP_IN_MAJOR;
2454 2453 esp_driver->minor_start = 0;
2455 2454 esp_driver->type = TTY_DRIVER_TYPE_SERIAL;
drivers/char/hvc_console.c
Diff comments   View file @ f4eaa37
... ... @@ -820,7 +820,6 @@
820 820 return -ENOMEM;
821 821  
822 822 drv->owner = THIS_MODULE;
823   - drv->devfs_name = "hvc/";
824 823 drv->driver_name = "hvc";
825 824 drv->name = "hvc";
826 825 drv->major = HVC_MAJOR;
... ... @@ -1364,7 +1364,6 @@
1364 1364  
1365 1365 hvcs_tty_driver->driver_name = hvcs_driver_name;
1366 1366 hvcs_tty_driver->name = hvcs_device_node;
1367   - hvcs_tty_driver->devfs_name = hvcs_device_node;
1368 1367  
1369 1368 /*
1370 1369 * We'll let the system assign us a major number, indicated by leaving
... ... @@ -1154,7 +1154,6 @@
1154 1154 return -ENOMEM;
1155 1155  
1156 1156 hvsi_driver->owner = THIS_MODULE;
1157   - hvsi_driver->devfs_name = "hvsi/";
1158 1157 hvsi_driver->driver_name = "hvsi";
1159 1158 hvsi_driver->name = "hvsi";
1160 1159 hvsi_driver->major = HVSI_MAJOR;
drivers/char/ip2/ip2main.c
Diff comments   View file @ f4eaa37
... ... @@ -671,7 +671,6 @@
671 671  
672 672 ip2_tty_driver->owner = THIS_MODULE;
673 673 ip2_tty_driver->name = "ttyF";
674   - ip2_tty_driver->devfs_name = "tts/F";
675 674 ip2_tty_driver->driver_name = pcDriver_name;
676 675 ip2_tty_driver->major = IP2_TTY_MAJOR;
677 676 ip2_tty_driver->minor_start = 0;
drivers/char/isicom.c
Diff comments   View file @ f4eaa37
... ... @@ -1581,7 +1581,6 @@
1581 1581  
1582 1582 isicom_normal->owner = THIS_MODULE;
1583 1583 isicom_normal->name = "ttyM";
1584   - isicom_normal->devfs_name = "isicom/";
1585 1584 isicom_normal->major = ISICOM_NMAJOR;
1586 1585 isicom_normal->minor_start = 0;
1587 1586 isicom_normal->type = TTY_DRIVER_TYPE_SERIAL;
... ... @@ -342,7 +342,6 @@
342 342 init_MUTEX(&moxaBuffSem);
343 343 moxaDriver->owner = THIS_MODULE;
344 344 moxaDriver->name = "ttyMX";
345   - moxaDriver->devfs_name = "tts/a";
346 345 moxaDriver->major = ttymajor;
347 346 moxaDriver->minor_start = 0;
348 347 moxaDriver->type = TTY_DRIVER_TYPE_SERIAL;
... ... @@ -264,7 +264,6 @@
264 264 pty_driver->owner = THIS_MODULE;
265 265 pty_driver->driver_name = "pty_master";
266 266 pty_driver->name = "pty";
267   - pty_driver->devfs_name = "pty/m";
268 267 pty_driver->major = PTY_MASTER_MAJOR;
269 268 pty_driver->minor_start = 0;
270 269 pty_driver->type = TTY_DRIVER_TYPE_PTY;
... ... @@ -282,7 +281,6 @@
282 281 pty_slave_driver->owner = THIS_MODULE;
283 282 pty_slave_driver->driver_name = "pty_slave";
284 283 pty_slave_driver->name = "ttyp";
285   - pty_slave_driver->devfs_name = "pty/s";
286 284 pty_slave_driver->major = PTY_SLAVE_MAJOR;
287 285 pty_slave_driver->minor_start = 0;
288 286 pty_slave_driver->type = TTY_DRIVER_TYPE_PTY;
drivers/char/riscom8.c
Diff comments   View file @ f4eaa37
... ... @@ -1634,7 +1634,6 @@
1634 1634 memset(IRQ_to_board, 0, sizeof(IRQ_to_board));
1635 1635 riscom_driver->owner = THIS_MODULE;
1636 1636 riscom_driver->name = "ttyL";
1637   - riscom_driver->devfs_name = "tts/L";
1638 1637 riscom_driver->major = RISCOM8_NORMAL_MAJOR;
1639 1638 riscom_driver->type = TTY_DRIVER_TYPE_SERIAL;
1640 1639 riscom_driver->subtype = SERIAL_TYPE_NORMAL;
drivers/char/rocket.c
Diff comments   View file @ f4eaa37
... ... @@ -2427,7 +2427,6 @@
2427 2427  
2428 2428 rocket_driver->owner = THIS_MODULE;
2429 2429 rocket_driver->flags = TTY_DRIVER_NO_DEVFS;
2430   - rocket_driver->devfs_name = "tts/R";
2431 2430 rocket_driver->name = "ttyR";
2432 2431 rocket_driver->driver_name = "Comtrol RocketPort";
2433 2432 rocket_driver->major = TTY_ROCKET_MAJOR;
drivers/char/serial167.c
Diff comments   View file @ f4eaa37
... ... @@ -2235,7 +2235,6 @@
2235 2235 /* Initialize the tty_driver structure */
2236 2236  
2237 2237 cy_serial_driver->owner = THIS_MODULE;
2238   - cy_serial_driver->devfs_name = "tts/";
2239 2238 cy_serial_driver->name = "ttyS";
2240 2239 cy_serial_driver->major = TTY_MAJOR;
2241 2240 cy_serial_driver->minor_start = 64;
drivers/char/stallion.c
Diff comments   View file @ f4eaa37
... ... @@ -3075,7 +3075,6 @@
3075 3075 stl_serial->owner = THIS_MODULE;
3076 3076 stl_serial->driver_name = stl_drvname;
3077 3077 stl_serial->name = "ttyE";
3078   - stl_serial->devfs_name = "tts/E";
3079 3078 stl_serial->major = STL_SERIALMAJOR;
3080 3079 stl_serial->minor_start = 0;
3081 3080 stl_serial->type = TTY_DRIVER_TYPE_SERIAL;
drivers/char/viocons.c
Diff comments   View file @ f4eaa37
... ... @@ -1152,7 +1152,6 @@
1152 1152 viotty_driver = alloc_tty_driver(VTTY_PORTS);
1153 1153 viotty_driver->owner = THIS_MODULE;
1154 1154 viotty_driver->driver_name = "vioconsole";
1155   - viotty_driver->devfs_name = "vcs/";
1156 1155 viotty_driver->name = "tty";
1157 1156 viotty_driver->name_base = 1;
1158 1157 viotty_driver->major = TTY_MAJOR;
drivers/char/vme_scc.c
Diff comments   View file @ f4eaa37
... ... @@ -147,7 +147,6 @@
147 147 scc_driver->owner = THIS_MODULE;
148 148 scc_driver->driver_name = "scc";
149 149 scc_driver->name = "ttyS";
150   - scc_driver->devfs_name = "tts/";
151 150 scc_driver->major = TTY_MAJOR;
152 151 scc_driver->minor_start = SCC_MINOR_BASE;
153 152 scc_driver->type = TTY_DRIVER_TYPE_SERIAL;
... ... @@ -2662,7 +2662,6 @@
2662 2662 if (!console_driver)
2663 2663 panic("Couldn't allocate console driver\n");
2664 2664 console_driver->owner = THIS_MODULE;
2665   - console_driver->devfs_name = "vc/";
2666 2665 console_driver->name = "tty";
2667 2666 console_driver->name_base = 1;
2668 2667 console_driver->major = TTY_MAJOR;
drivers/isdn/capi/capi.c
Diff comments   View file @ f4eaa37
... ... @@ -1336,7 +1336,6 @@
1336 1336  
1337 1337 drv->owner = THIS_MODULE;
1338 1338 drv->driver_name = "capi_nc";
1339   - drv->devfs_name = "capi/";
1340 1339 drv->name = "capi";
1341 1340 drv->major = capi_ttymajor;
1342 1341 drv->minor_start = 0;
drivers/isdn/gigaset/bas-gigaset.c
Diff comments   View file @ f4eaa37
... ... @@ -41,7 +41,6 @@
41 41 #define GIGASET_MINORS 1
42 42 #define GIGASET_MINOR 16
43 43 #define GIGASET_MODULENAME "bas_gigaset"
44   -#define GIGASET_DEVFSNAME "gig/bas/"
45 44 #define GIGASET_DEVNAME "ttyGB"
46 45  
47 46 /* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */
... ... @@ -2349,8 +2348,7 @@
2349 2348 /* allocate memory for our driver state and intialize it */
2350 2349 if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
2351 2350 GIGASET_MODULENAME, GIGASET_DEVNAME,
2352   - GIGASET_DEVFSNAME, &gigops,
2353   - THIS_MODULE)) == NULL)
  2351 + &gigops, THIS_MODULE)) == NULL)
2354 2352 goto error;
2355 2353  
2356 2354 /* allocate memory for our device state and intialize it */
drivers/isdn/gigaset/common.c
Diff comments   View file @ f4eaa37
... ... @@ -1092,14 +1092,12 @@
1092 1092 * minors Number of minors this driver can handle
1093 1093 * procname Name of the driver
1094 1094 * devname Name of the device files (prefix without minor number)
1095   - * devfsname Devfs name of the device files without %d
1096 1095 * return value:
1097 1096 * Pointer to the gigaset_driver structure on success, NULL on failure.
1098 1097 */
1099 1098 struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
1100 1099 const char *procname,
1101 1100 const char *devname,
1102   - const char *devfsname,
1103 1101 const struct gigaset_ops *ops,
1104 1102 struct module *owner)
1105 1103 {
... ... @@ -1139,7 +1137,7 @@
1139 1137 drv->cs[i].minor_index = i;
1140 1138 }
1141 1139  
1142   - gigaset_if_initdriver(drv, procname, devname, devfsname);
  1140 + gigaset_if_initdriver(drv, procname, devname);
1143 1141  
1144 1142 spin_lock_irqsave(&driver_lock, flags);
1145 1143 list_add(&drv->list, &drivers);
drivers/isdn/gigaset/gigaset.h
Diff comments   View file @ f4eaa37
... ... @@ -769,7 +769,6 @@
769 769 struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
770 770 const char *procname,
771 771 const char *devname,
772   - const char *devfsname,
773 772 const struct gigaset_ops *ops,
774 773 struct module *owner);
775 774  
... ... @@ -892,7 +891,7 @@
892 891  
893 892 /* initialize interface */
894 893 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
895   - const char *devname, const char *devfsname);
  894 + const char *devname);
896 895 /* release interface */
897 896 void gigaset_if_freedriver(struct gigaset_driver *drv);
898 897 /* add minor */
drivers/isdn/gigaset/interface.c
Diff comments   View file @ f4eaa37
... ... @@ -673,10 +673,9 @@
673 673 * drv Driver
674 674 * procname Name of the driver (e.g. for /proc/tty/drivers)
675 675 * devname Name of the device files (prefix without minor number)
676   - * devfsname Devfs name of the device files without %d
677 676 */
678 677 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
679   - const char *devname, const char *devfsname)
  678 + const char *devname)
680 679 {
681 680 unsigned minors = drv->minors;
682 681 int ret;
... ... @@ -700,7 +699,6 @@
700 699 tty->num = drv->minors;
701 700  
702 701 tty->owner = THIS_MODULE;
703   - tty->devfs_name = devfsname;
704 702  
705 703 tty->init_termios = tty_std_termios; //FIXME
706 704 tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; //FIXME
drivers/isdn/gigaset/usb-gigaset.c
Diff comments   View file @ f4eaa37
... ... @@ -41,7 +41,6 @@
41 41 #define GIGASET_MINORS 1
42 42 #define GIGASET_MINOR 8
43 43 #define GIGASET_MODULENAME "usb_gigaset"
44   -#define GIGASET_DEVFSNAME "gig/usb/"
45 44 #define GIGASET_DEVNAME "ttyGU"
46 45  
47 46 #define IF_WRITEBUF 2000 //FIXME // WAKEUP_CHARS: 256
... ... @@ -896,8 +895,7 @@
896 895 /* allocate memory for our driver state and intialize it */
897 896 if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
898 897 GIGASET_MODULENAME, GIGASET_DEVNAME,
899   - GIGASET_DEVFSNAME, &ops,
900   - THIS_MODULE)) == NULL)
  898 + &ops, THIS_MODULE)) == NULL)
901 899 goto error;
902 900  
903 901 /* allocate memory for our device state and intialize it */
drivers/isdn/i4l/isdn_tty.c
Diff comments   View file @ f4eaa37
... ... @@ -1890,7 +1890,6 @@
1890 1890 if (!m->tty_modem)
1891 1891 return -ENOMEM;
1892 1892 m->tty_modem->name = "ttyI";
1893   - m->tty_modem->devfs_name = "isdn/ttyI";
1894 1893 m->tty_modem->major = ISDN_TTY_MAJOR;
1895 1894 m->tty_modem->minor_start = 0;
1896 1895 m->tty_modem->type = TTY_DRIVER_TYPE_SERIAL;
drivers/s390/char/tty3270.c
Diff comments   View file @ f4eaa37
... ... @@ -1785,7 +1785,6 @@
1785 1785 * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc
1786 1786 */
1787 1787 driver->owner = THIS_MODULE;
1788   - driver->devfs_name = "ttyTUB/";
1789 1788 driver->driver_name = "ttyTUB";
1790 1789 driver->name = "ttyTUB";
1791 1790 driver->major = IBM_TTY3270_MAJOR;
... ... @@ -1745,7 +1745,6 @@
1745 1745 /* Not all of this is exactly right for us. */
1746 1746  
1747 1747 serial_driver->owner = THIS_MODULE;
1748   - serial_driver->devfs_name = "tts/";
1749 1748 serial_driver->name = "ttyS";
1750 1749 serial_driver->major = TTY_MAJOR;
1751 1750 serial_driver->minor_start = 64;
drivers/usb/class/cdc-acm.c
Diff comments   View file @ f4eaa37
... ... @@ -1145,7 +1145,6 @@
1145 1145 acm_tty_driver->owner = THIS_MODULE,
1146 1146 acm_tty_driver->driver_name = "acm",
1147 1147 acm_tty_driver->name = "ttyACM",
1148   - acm_tty_driver->devfs_name = "usb/acm/",
1149 1148 acm_tty_driver->major = ACM_TTY_MAJOR,
1150 1149 acm_tty_driver->minor_start = 0,
1151 1150 acm_tty_driver->type = TTY_DRIVER_TYPE_SERIAL,
drivers/usb/gadget/serial.c
Diff comments   View file @ f4eaa37
... ... @@ -588,7 +588,6 @@
588 588 gs_tty_driver->owner = THIS_MODULE;
589 589 gs_tty_driver->driver_name = GS_SHORT_NAME;
590 590 gs_tty_driver->name = "ttygs";
591   - gs_tty_driver->devfs_name = "usb/ttygs/";
592 591 gs_tty_driver->major = GS_MAJOR;
593 592 gs_tty_driver->minor_start = GS_MINOR_START;
594 593 gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
drivers/usb/serial/usb-serial.c
Diff comments   View file @ f4eaa37
... ... @@ -1059,7 +1059,6 @@
1059 1059  
1060 1060 usb_serial_tty_driver->owner = THIS_MODULE;
1061 1061 usb_serial_tty_driver->driver_name = "usbserial";
1062   - usb_serial_tty_driver->devfs_name = "usb/tts/";
1063 1062 usb_serial_tty_driver->name = "ttyUSB";
1064 1063 usb_serial_tty_driver->major = SERIAL_TTY_MAJOR;
1065 1064 usb_serial_tty_driver->minor_start = 0;
include/linux/tty_driver.h
Diff comments   View file @ f4eaa37
... ... @@ -157,7 +157,6 @@
157 157 struct cdev cdev;
158 158 struct module *owner;
159 159 const char *driver_name;
160   - const char *devfs_name;
161 160 const char *name;
162 161 int name_base; /* offset of printed name */
163 162 int major; /* major device number */
net/bluetooth/rfcomm/tty.c
Diff comments   View file @ f4eaa37
... ... @@ -1025,7 +1025,6 @@
1025 1025  
1026 1026 rfcomm_tty_driver->owner = THIS_MODULE;
1027 1027 rfcomm_tty_driver->driver_name = "rfcomm";
1028   - rfcomm_tty_driver->devfs_name = "bluetooth/rfcomm/";
1029 1028 rfcomm_tty_driver->name = "rfcomm";
1030 1029 rfcomm_tty_driver->major = RFCOMM_TTY_MAJOR;
1031 1030 rfcomm_tty_driver->minor_start = RFCOMM_TTY_MINOR;
net/irda/ircomm/ircomm_tty.c
Diff comments   View file @ f4eaa37
... ... @@ -124,7 +124,6 @@
124 124 driver->owner = THIS_MODULE;
125 125 driver->driver_name = "ircomm";
126 126 driver->name = "ircomm";
127   - driver->devfs_name = "ircomm";
128 127 driver->major = IRCOMM_TTY_MAJOR;
129 128 driver->minor_start = IRCOMM_TTY_MINOR;
130 129 driver->type = TTY_DRIVER_TYPE_SERIAL;