10 files changed, 45 insertions, 72 deletions

diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 9ca889adf120..18ab8652aa57 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ISDN_DRV_GIGASET
         tristate "Siemens Gigaset support"
+        depends on ISDN_I4L
         select CRC_CCITT
         select BITREVERSE
         help
@@ -42,11 +43,4 @@ config GIGASET_DEBUG
           This enables debugging code in the Gigaset drivers.
           If in doubt, say yes.
 
-config GIGASET_UNDOCREQ
-        bool "Support for undocumented USB requests"
-        help
-          This enables support for USB requests we only know from
-          reverse engineering (currently M105 only). If you need
-          features like configuration mode of M105, say yes.
-
 endif # ISDN_DRV_GIGASET
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index 2a4ce96f04bd..234cc5d53312 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -174,9 +174,8 @@ byte_stuff:
 
                                 if (unlikely(fcs != PPP_GOODFCS)) {
                                         dev_err(cs->dev,
-                                            "Packet checksum at %lu failed, "
-                                            "packet is corrupted (%u bytes)!\n",
-                                            bcs->rcvbytes, skb->len);
+                                "Checksum failed, %u bytes corrupted!\n",
+                                                skb->len);
                                         compskb = NULL;
                                         gigaset_rcv_error(compskb, cs, bcs);
                                         error = 1;
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 0048ce98bfa8..e4141bf8b2f3 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -565,8 +565,6 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         gig_dbg(DEBUG_INIT, "setting up bcs[%d]->at_state", channel);
         gigaset_at_init(&bcs->at_state, bcs, cs, -1);
 
-        bcs->rcvbytes = 0;
-
 #ifdef CONFIG_GIGASET_DEBUG
         bcs->emptycount = 0;
 #endif
@@ -672,14 +670,8 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         cs->tty = NULL;
         cs->tty_dev = NULL;
         cs->cidmode = cidmode != 0;
-
-        //if(onechannel) { //FIXME
-                cs->tabnocid = gigaset_tab_nocid_m10x;
-                cs->tabcid = gigaset_tab_cid_m10x;
-        //} else {
-        //      cs->tabnocid = gigaset_tab_nocid;
-        //      cs->tabcid = gigaset_tab_cid;
-        //}
+        cs->tabnocid = gigaset_tab_nocid;
+        cs->tabcid = gigaset_tab_cid;
 
         init_waitqueue_head(&cs->waitqueue);
         cs->waiting = 0;
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index e582a4887bc1..ec5169604a6a 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -160,7 +160,7 @@
 
 
 // 100: init, 200: dle0, 250:dle1, 300: get cid (dial), 350: "hup" (no cid), 400: hup, 500: reset, 600: dial, 700: ring
-struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */
+struct reply_t gigaset_tab_nocid[] =
 {
         /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
 
@@ -280,7 +280,7 @@ struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */
 };
 
 // 600: start dialing, 650: dial in progress, 800: connection is up, 700: ring, 400: hup, 750: accepted icall
-struct reply_t gigaset_tab_cid_m10x[] = /* for M10x */
+struct reply_t gigaset_tab_cid[] =
 {
         /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
 
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 747178f03d2c..a2f6125739eb 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -282,8 +282,8 @@ struct reply_t {
         char    *command;       /* NULL==none */
 };
 
-extern struct reply_t gigaset_tab_cid_m10x[];
-extern struct reply_t gigaset_tab_nocid_m10x[];
+extern struct reply_t gigaset_tab_cid[];
+extern struct reply_t gigaset_tab_nocid[];
 
 struct inbuf_t {
         unsigned char           *rcvbuf;        /* usb-gigaset receive buffer */
@@ -384,7 +384,6 @@ struct bc_state {
         int trans_up;                   /* Counter of packages (upstream) */
 
         struct at_state_t at_state;
-        unsigned long rcvbytes;
 
         __u16 fcs;
         struct sk_buff *skb;
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 69a702f0db93..9b22f9cf2f33 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -544,11 +544,11 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
 
         gig_dbg(DEBUG_ANY, "Register driver capabilities to LL");
 
-        //iif->id[sizeof(iif->id) - 1]=0;
-        //strncpy(iif->id, isdnid, sizeof(iif->id) - 1);
         if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index)
-            >= sizeof iif->id)
-                return -ENOMEM; //FIXME EINVAL/...??
+            >= sizeof iif->id) {
+                pr_err("ID too long: %s\n", isdnid);
+                return 0;
+        }
 
         iif->owner = THIS_MODULE;
         iif->channels = cs->channels;
@@ -568,8 +568,10 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
         iif->rcvcallb_skb = NULL;               /* Will be set by LL */
         iif->statcallb = NULL;                  /* Will be set by LL */
 
-        if (!register_isdn(iif))
+        if (!register_isdn(iif)) {
+                pr_err("register_isdn failed\n");
                 return 0;
+        }
 
         cs->myid = iif->channels;               /* Set my device id */
         return 1;
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 820a30923fee..1ebfcab74662 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -599,8 +599,7 @@ void gigaset_if_init(struct cardstate *cs)
         if (!IS_ERR(cs->tty_dev))
                 dev_set_drvdata(cs->tty_dev, cs);
         else {
-                dev_warn(cs->dev,
-                         "could not register device to the tty subsystem\n");
+                pr_warning("could not register device to the tty subsystem\n");
                 cs->tty_dev = NULL;
         }
         mutex_unlock(&cs->mutex);
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index b171e75cb52e..09202a5a3444 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -246,6 +246,10 @@ static inline void dump_bytes(enum debuglevel level, const char *tag,
         unsigned char c;
         static char dbgline[3 * 32 + 1];
         int i = 0;
+
+        if (!(gigaset_debuglevel & level))
+                return;
+
         while (count-- > 0) {
                 if (i > sizeof(dbgline) - 4) {
                         dbgline[i] = '\0';
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index da6f3acf9fd0..9715aad9c3f0 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -79,5 +79,5 @@ void gigaset_init_dev_sysfs(struct cardstate *cs)
 
         gig_dbg(DEBUG_INIT, "setting up sysfs");
         if (device_create_file(cs->tty_dev, &dev_attr_cidmode))
-                dev_err(cs->dev, "could not create sysfs attribute\n");
+                pr_err("could not create sysfs attribute\n");
 }
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index d78385166099..4deb1ab0dbf8 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -153,8 +153,6 @@ static inline unsigned tiocm_to_gigaset(unsigned state)
         return ((state & TIOCM_DTR) ? 1 : 0) | ((state & TIOCM_RTS) ? 2 : 0);
 }
 
-#ifdef CONFIG_GIGASET_UNDOCREQ
-/* WARNING: EXPERIMENTAL! */
 static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
                                   unsigned new_state)
 {
@@ -176,6 +174,11 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
         return 0;
 }
 
+/*
+ * Set M105 configuration value
+ * using undocumented device commands reverse engineered from USB traces
+ * of the Siemens Windows driver
+ */
 static int set_value(struct cardstate *cs, u8 req, u16 val)
 {
         struct usb_device *udev = cs->hw.usb->udev;
@@ -205,8 +208,10 @@ static int set_value(struct cardstate *cs, u8 req, u16 val)
         return r < 0 ? r : (r2 < 0 ? r2 : 0);
 }
 
-/* WARNING: HIGHLY EXPERIMENTAL! */
-// don't use this in an interrupt/BH
+/*
+ * set the baud rate on the internal serial adapter
+ * using the undocumented parameter setting command
+ */
 static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
 {
         u16 val;
@@ -237,8 +242,10 @@ static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
         return set_value(cs, 1, val);
 }
 
-/* WARNING: HIGHLY EXPERIMENTAL! */
-// don't use this in an interrupt/BH
+/*
+ * set the line format on the internal serial adapter
+ * using the undocumented parameter setting command
+ */
 static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
 {
         u16 val = 0;
@@ -274,24 +281,6 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
         return set_value(cs, 3, val);
 }
 
-#else
-static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
-                                  unsigned new_state)
-{
-        return -ENOTTY;
-}
-
-static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
-{
-        return -ENOTTY;
-}
-
-static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
-{
-        return -ENOTTY;
-}
-#endif
-
 
  /*================================================================================================================*/
 static int gigaset_init_bchannel(struct bc_state *bcs)
@@ -362,10 +351,8 @@ static void gigaset_modem_fill(unsigned long data)
         } while (again);
 }
 
-/**
- *      gigaset_read_int_callback
- *
- *      It is called if the data was received from the device.
+/*
+ * Interrupt Input URB completion routine
  */
 static void gigaset_read_int_callback(struct urb *urb)
 {
@@ -567,18 +554,19 @@ static int gigaset_chars_in_buffer(struct cardstate *cs)
         return cs->cmdbytes;
 }
 
+/*
+ * set the break characters on the internal serial adapter
+ * using undocumented device commands reverse engineered from USB traces
+ * of the Siemens Windows driver
+ */
 static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
 {
-#ifdef CONFIG_GIGASET_UNDOCREQ
         struct usb_device *udev = cs->hw.usb->udev;
 
         gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
         memcpy(cs->hw.usb->bchars, buf, 6);
         return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
                                0, 0, &buf, 6, 2000);
-#else
-        return -ENOTTY;
-#endif
 }
 
 static int gigaset_freebcshw(struct bc_state *bcs)
@@ -625,7 +613,6 @@ static int gigaset_initcshw(struct cardstate *cs)
         ucs->bchars[5] = 0x13;
         ucs->bulk_out_buffer = NULL;
         ucs->bulk_out_urb = NULL;
-        //ucs->urb_cmd_out = NULL;
         ucs->read_urb = NULL;
         tasklet_init(&cs->write_tasklet,
                      &gigaset_modem_fill, (unsigned long) cs);
@@ -742,7 +729,7 @@ static int gigaset_probe(struct usb_interface *interface,
         cs->dev = &interface->dev;
 
         /* save address of controller structure */
-        usb_set_intfdata(interface, cs); // dev_set_drvdata(&interface->dev, cs);
+        usb_set_intfdata(interface, cs);
 
         endpoint = &hostif->endpoint[0].desc;
 
@@ -921,8 +908,7 @@ static const struct gigaset_ops ops = {
         gigaset_m10x_input,
 };
 
-/**
- *      usb_gigaset_init
+/*
  * This function is called while kernel-module is loaded
  */
 static int __init usb_gigaset_init(void)
@@ -952,9 +938,7 @@ error:
         return -1;
 }
 
-
-/**
- *      usb_gigaset_exit
+/*
  * This function is called while unloading the kernel-module
  */
 static void __exit usb_gigaset_exit(void)