5 files changed, 6 insertions, 15 deletions

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 8a45715dd4c1..3845defd4901 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -41,7 +41,6 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");
 #define GIGASET_MINORS     1
 #define GIGASET_MINOR      16
 #define GIGASET_MODULENAME "bas_gigaset"
-#define GIGASET_DEVFSNAME  "gig/bas/"
 #define GIGASET_DEVNAME    "ttyGB"
 
 /* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */
@@ -2349,8 +2348,7 @@ static int __init bas_gigaset_init(void)
         /* allocate memory for our driver state and intialize it */
         if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                        GIGASET_MODULENAME, GIGASET_DEVNAME,
-                                       GIGASET_DEVFSNAME, &gigops,
-                                       THIS_MODULE)) == NULL)
+                                       &gigops, THIS_MODULE)) == NULL)
                 goto error;
 
         /* allocate memory for our device state and intialize it */
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 2a56bf33a673..aca165d43aa0 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -1092,14 +1092,12 @@ EXPORT_SYMBOL_GPL(gigaset_freedriver);
  *      minors          Number of minors this driver can handle
  *      procname        Name of the driver
  *      devname         Name of the device files (prefix without minor number)
- *      devfsname       Devfs name of the device files without %d
  * return value:
  *      Pointer to the gigaset_driver structure on success, NULL on failure.
  */
 struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
                                           const char *procname,
                                           const char *devname,
-                                          const char *devfsname,
                                           const struct gigaset_ops *ops,
                                           struct module *owner)
 {
@@ -1139,7 +1137,7 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
                 drv->cs[i].minor_index = i;
         }
 
-        gigaset_if_initdriver(drv, procname, devname, devfsname);
+        gigaset_if_initdriver(drv, procname, devname);
 
         spin_lock_irqsave(&driver_lock, flags);
         list_add(&drv->list, &drivers);
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 8d63d822104f..1ca3bfdef51d 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -769,7 +769,6 @@ void gigaset_block_channels(struct cardstate *cs);
 struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
                                           const char *procname,
                                           const char *devname,
-                                          const char *devfsname,
                                           const struct gigaset_ops *ops,
                                           struct module *owner);
 
@@ -892,7 +891,7 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
 
 /* initialize interface */
 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
-                           const char *devname, const char *devfsname);
+                           const char *devname);
 /* release interface */
 void gigaset_if_freedriver(struct gigaset_driver *drv);
 /* add minor */
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 74fd234956c8..bd2e4267528e 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -673,10 +673,9 @@ EXPORT_SYMBOL_GPL(gigaset_if_receive);
  *      drv             Driver
  *      procname        Name of the driver (e.g. for /proc/tty/drivers)
  *      devname         Name of the device files (prefix without minor number)
- *      devfsname       Devfs name of the device files without %d
  */
 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
-                           const char *devname, const char *devfsname)
+                           const char *devname)
 {
         unsigned minors = drv->minors;
         int ret;
@@ -692,7 +691,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
         tty->major =            GIG_MAJOR,
         tty->type =             TTY_DRIVER_TYPE_SERIAL,
         tty->subtype =          SERIAL_TYPE_NORMAL,
-        tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,
+        tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
 
         tty->driver_name =      procname;
         tty->name =             devname;
@@ -700,7 +699,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
         tty->num =              drv->minors;
 
         tty->owner =            THIS_MODULE;
-        tty->devfs_name =       devfsname;
 
         tty->init_termios          = tty_std_termios; //FIXME
         tty->init_termios.c_cflag  = B9600 | CS8 | CREAD | HUPCL | CLOCAL; //FIXME
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index d86ab68114b0..6e05d9d4a51a 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -41,7 +41,6 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");
 #define GIGASET_MINORS     1
 #define GIGASET_MINOR      8
 #define GIGASET_MODULENAME "usb_gigaset"
-#define GIGASET_DEVFSNAME  "gig/usb/"
 #define GIGASET_DEVNAME    "ttyGU"
 
 #define IF_WRITEBUF 2000 //FIXME  // WAKEUP_CHARS: 256
@@ -896,8 +895,7 @@ static int __init usb_gigaset_init(void)
         /* allocate memory for our driver state and intialize it */
         if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                        GIGASET_MODULENAME, GIGASET_DEVNAME,
-                                       GIGASET_DEVFSNAME, &ops,
-                                       THIS_MODULE)) == NULL)
+                                       &ops, THIS_MODULE)) == NULL)
                 goto error;
 
         /* allocate memory for our device state and intialize it */