From: "Marc - A. Dahlhaus" <mad@wol.de>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] Fix capi devicenames
Date: Wed, 29 Sep 2010 21:21:23 +0200 [thread overview]
Message-ID: <4CA391B3.1030806@wol.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]
capi device names should get changed to what userspace expects.
Without this change recent udev versions can't produce working device
nodes as the capi control device node name "capi" collides with the
"capi" directory under which userspace expects to get the application
device nodes. This also fixes the Documentation.
Signed-off-by: Marc - Andre Dahlhaus <mad@wol.de>
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -1248,10 +1248,10 @@ Your cooperation is appreciated.
68 char CAPI 2.0 interface
0 = /dev/capi20 Control device
- 1 = /dev/capi20.00 First CAPI 2.0 application
- 2 = /dev/capi20.01 Second CAPI 2.0 application
+ 1 = /dev/capi/0 First CAPI 2.0 application
+ 2 = /dev/capi/1 Second CAPI 2.0 application
...
- 20 = /dev/capi20.19 19th CAPI 2.0 application
+ 20 = /dev/capi/19 19th CAPI 2.0 application
ISDN CAPI 2.0 driver for use with CAPI 2.0
applications; currently supports the AVM B1 card.
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1363,7 +1363,7 @@ static int __init capinc_tty_init(void)
}
drv->owner = THIS_MODULE;
drv->driver_name = "capi_nc";
- drv->name = "capi";
+ drv->name = "capi/";
drv->major = 0;
drv->minor_start = 0;
drv->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1509,7 +1509,7 @@ static int __init capi_init(void)
return PTR_ERR(capi_class);
}
- device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
+ device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi20");
if (capinc_tty_init() < 0) {
device_destroy(capi_class, MKDEV(capi_major, 0));
[-- Attachment #2: capi-name.patch --]
[-- Type: text/plain, Size: 1607 bytes --]
capi device names should get changed to what userspace expects.
Without this change recent udev versions can't produce working device
nodes as the capi control device node name "capi" collides with the
"capi" directory under which userspace expects to get the application
device nodes. This also fixes the Documentation.
Signed-off-by: Marc - Andre Dahlhaus <mad@wol.de>
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -1248,10 +1248,10 @@ Your cooperation is appreciated.
68 char CAPI 2.0 interface
0 = /dev/capi20 Control device
- 1 = /dev/capi20.00 First CAPI 2.0 application
- 2 = /dev/capi20.01 Second CAPI 2.0 application
+ 1 = /dev/capi/0 First CAPI 2.0 application
+ 2 = /dev/capi/1 Second CAPI 2.0 application
...
- 20 = /dev/capi20.19 19th CAPI 2.0 application
+ 20 = /dev/capi/19 19th CAPI 2.0 application
ISDN CAPI 2.0 driver for use with CAPI 2.0
applications; currently supports the AVM B1 card.
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1363,7 +1363,7 @@ static int __init capinc_tty_init(void)
}
drv->owner = THIS_MODULE;
drv->driver_name = "capi_nc";
- drv->name = "capi";
+ drv->name = "capi/";
drv->major = 0;
drv->minor_start = 0;
drv->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1509,7 +1509,7 @@ static int __init capi_init(void)
return PTR_ERR(capi_class);
}
- device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
+ device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi20");
if (capinc_tty_init() < 0) {
device_destroy(capi_class, MKDEV(capi_major, 0));
next reply other threads:[~2010-09-29 19:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-29 19:21 Marc - A. Dahlhaus [this message]
2010-09-30 9:30 ` [PATCH] Fix capi devicenames Alan Cox
2010-09-30 10:08 ` Kay Sievers
2010-09-30 10:56 ` Alan Cox
2010-09-30 10:37 ` Marc - A. Dahlhaus
2010-09-30 10:50 ` Kay Sievers
2010-09-30 11:29 ` Alan Cox
2010-09-30 12:50 ` Marc - A. Dahlhaus
2010-09-30 17:35 ` Olivier Galibert
2010-09-30 19:20 ` Kay Sievers
2010-10-01 8:02 ` [PATCH] Fix capi devicenames v2 Marc - A. Dahlhaus
2010-10-01 8:36 ` [PATCH] Fix capi devicenames Marc - A. Dahlhaus
2010-10-01 9:20 ` Kay Sievers
2010-09-30 11:35 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CA391B3.1030806@wol.de \
--to=mad@wol.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox