Commit 3d5daf73 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix tty drivers which dont set tty_driver->devfs_name

From: Marcelo Tosatti <marcelo.tosatti@cyclades.com>

The following patches fixes tty drivers which dont set devfs_name. Not
doing so will cause the tty layer to create "/dev/<NULL>x" entries when
devfs is being used.

I used "drivername/" in isicom and pcxe because the letter used to
identify them are already used by other drivers.
parent 57c08314
...@@ -5411,6 +5411,7 @@ cy_init(void) ...@@ -5411,6 +5411,7 @@ cy_init(void)
cy_serial_driver->owner = THIS_MODULE; cy_serial_driver->owner = THIS_MODULE;
cy_serial_driver->driver_name = "cyclades"; cy_serial_driver->driver_name = "cyclades";
cy_serial_driver->name = "ttyC"; cy_serial_driver->name = "ttyC";
cy_serial_driver->devfs_name = "tts/C";
cy_serial_driver->major = CYCLADES_MAJOR; cy_serial_driver->major = CYCLADES_MAJOR;
cy_serial_driver->minor_start = 0; cy_serial_driver->minor_start = 0;
cy_serial_driver->type = TTY_DRIVER_TYPE_SERIAL; cy_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
......
...@@ -1644,6 +1644,7 @@ int __init pc_init(void) ...@@ -1644,6 +1644,7 @@ int __init pc_init(void)
pc_driver->owner = THIS_MODULE; pc_driver->owner = THIS_MODULE;
pc_driver->name = "ttyD"; pc_driver->name = "ttyD";
pc_driver->devfs_name = "tts/D";
pc_driver->major = DIGI_MAJOR; pc_driver->major = DIGI_MAJOR;
pc_driver->minor_start = 0; pc_driver->minor_start = 0;
pc_driver->type = TTY_DRIVER_TYPE_SERIAL; pc_driver->type = TTY_DRIVER_TYPE_SERIAL;
......
...@@ -2491,6 +2491,7 @@ int __init espserial_init(void) ...@@ -2491,6 +2491,7 @@ int __init espserial_init(void)
esp_driver->owner = THIS_MODULE; esp_driver->owner = THIS_MODULE;
esp_driver->name = "ttyP"; esp_driver->name = "ttyP";
esp_driver->devfs_name = "tts/P";
esp_driver->major = ESP_IN_MAJOR; esp_driver->major = ESP_IN_MAJOR;
esp_driver->minor_start = 0; esp_driver->minor_start = 0;
esp_driver->type = TTY_DRIVER_TYPE_SERIAL; esp_driver->type = TTY_DRIVER_TYPE_SERIAL;
......
...@@ -1627,6 +1627,7 @@ static int register_drivers(void) ...@@ -1627,6 +1627,7 @@ static int register_drivers(void)
isicom_normal->owner = THIS_MODULE; isicom_normal->owner = THIS_MODULE;
isicom_normal->name = "ttyM"; isicom_normal->name = "ttyM";
isicom_normal->devfs_name = "isicom/";
isicom_normal->major = ISICOM_NMAJOR; isicom_normal->major = ISICOM_NMAJOR;
isicom_normal->minor_start = 0; isicom_normal->minor_start = 0;
isicom_normal->type = TTY_DRIVER_TYPE_SERIAL; isicom_normal->type = TTY_DRIVER_TYPE_SERIAL;
......
...@@ -309,6 +309,7 @@ static int __init moxa_init(void) ...@@ -309,6 +309,7 @@ static int __init moxa_init(void)
init_MUTEX(&moxaBuffSem); init_MUTEX(&moxaBuffSem);
moxaDriver->owner = THIS_MODULE; moxaDriver->owner = THIS_MODULE;
moxaDriver->name = "ttya"; moxaDriver->name = "ttya";
moxaDriver->devfs_name = "tts/a";
moxaDriver->major = ttymajor; moxaDriver->major = ttymajor;
moxaDriver->minor_start = 0; moxaDriver->minor_start = 0;
moxaDriver->type = TTY_DRIVER_TYPE_SERIAL; moxaDriver->type = TTY_DRIVER_TYPE_SERIAL;
......
...@@ -1150,6 +1150,7 @@ static int __init pcxe_init(void) ...@@ -1150,6 +1150,7 @@ static int __init pcxe_init(void)
pcxe_driver->owner = THIS_MODULE; pcxe_driver->owner = THIS_MODULE;
pcxe_driver->name = "ttyD"; pcxe_driver->name = "ttyD";
pcxe_driver->devfs_name = "pcxe/";
pcxe_driver->major = DIGI_MAJOR; pcxe_driver->major = DIGI_MAJOR;
pcxe_driver->minor_start = 0; pcxe_driver->minor_start = 0;
pcxe_driver->type = TTY_DRIVER_TYPE_SERIAL; pcxe_driver->type = TTY_DRIVER_TYPE_SERIAL;
......
...@@ -1687,6 +1687,7 @@ static inline int rc_init_drivers(void) ...@@ -1687,6 +1687,7 @@ static inline int rc_init_drivers(void)
memset(IRQ_to_board, 0, sizeof(IRQ_to_board)); memset(IRQ_to_board, 0, sizeof(IRQ_to_board));
riscom_driver->owner = THIS_MODULE; riscom_driver->owner = THIS_MODULE;
riscom_driver->name = "ttyL"; riscom_driver->name = "ttyL";
riscom_driver->devfs_name = "tts/L";
riscom_driver->major = RISCOM8_NORMAL_MAJOR; riscom_driver->major = RISCOM8_NORMAL_MAJOR;
riscom_driver->type = TTY_DRIVER_TYPE_SERIAL; riscom_driver->type = TTY_DRIVER_TYPE_SERIAL;
riscom_driver->subtype = SERIAL_TYPE_NORMAL; riscom_driver->subtype = SERIAL_TYPE_NORMAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment