diff options
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | tty/tty-cyclades-cleanup | 33 | ||||
| -rw-r--r-- | tty/tty-cyclades-fix-const-assign | 28 | ||||
| -rw-r--r-- | tty/tty-cyclades-ioctl-cleanup | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-merge-startup-common | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-modem-cleanup | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-port-close | 30 | ||||
| -rw-r--r-- | tty/tty-cyclades-precompute | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-refcount | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-remove-set-line-dups | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-sleep-not-busy | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-use-dtr-helpers | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-use-port-block-helper | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-use-port-close | 4 | ||||
| -rw-r--r-- | tty/tty-cyclades-use-port-hangup | 4 |
15 files changed, 64 insertions, 72 deletions
@@ -70,7 +70,6 @@ tty/tty-cyclades-ioctl-cleanup tty/tty-cyclades-modem-cleanup tty/tty-cyclades-add-io-helpers tty/tty-cyclades-remove-set-line-dups -tty/tty-cyclades-fix-const-assign tty/net-slip-ttyfix tty/kfifo-const tty/tty-usb-mos7720-modem diff --git a/tty/tty-cyclades-cleanup b/tty/tty-cyclades-cleanup index aa9b3218748631..931482e983d846 100644 --- a/tty/tty-cyclades-cleanup +++ b/tty/tty-cyclades-cleanup @@ -17,12 +17,10 @@ Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/char/cyclades.c | 600 +---------------------------------------------- - 1 files changed, 13 insertions(+), 587 deletions(-) + drivers/char/cyclades.c | 598 ------------------------------------------------ + 1 file changed, 12 insertions(+), 586 deletions(-) -diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c -index 87a40bc..487b09b 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -11,7 +11,7 @@ @@ -623,7 +621,7 @@ index 87a40bc..487b09b 100644 #include <linux/uaccess.h> #include <linux/kernel.h> -@@ -666,7 +96,6 @@ static void cy_send_xchar(struct tty_struct *tty, char ch); +@@ -666,7 +96,6 @@ static void cy_send_xchar(struct tty_str #ifndef SERIAL_XMIT_SIZE #define SERIAL_XMIT_SIZE (min(PAGE_SIZE, 4096)) #endif @@ -631,16 +629,7 @@ index 87a40bc..487b09b 100644 #define STD_COM_FLAGS (0) -@@ -716,7 +145,7 @@ static struct tty_driver *cy_serial_driver; - causing problems, remove the offending address from this table. - */ - --static unsigned int cy_isa_addresses[] = { -+static const unsigned int cy_isa_addresses[] = { - 0xD0000, - 0xD2000, - 0xD4000, -@@ -756,25 +185,25 @@ static int cy_next_channel; /* next minor available */ +@@ -756,25 +185,25 @@ static int cy_next_channel; /* next mino * HI VHI * 20 */ @@ -670,7 +659,7 @@ index 87a40bc..487b09b 100644 /* value => 00 01 02 03 04 */ /* divide by 8 32 128 512 2048 */ 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, -@@ -782,13 +211,13 @@ static char baud_co_60[] = { /* 60 MHz clock option table (CD1400 J) */ +@@ -782,13 +211,13 @@ static char baud_co_60[] = { /* 60 MHz c 0x00 }; @@ -686,7 +675,7 @@ index 87a40bc..487b09b 100644 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x07, 0x07 -@@ -805,7 +234,7 @@ static char baud_cor3[] = { /* receive threshold */ +@@ -805,7 +234,7 @@ static char baud_cor3[] = { /* receive t * cables. */ @@ -695,7 +684,7 @@ index 87a40bc..487b09b 100644 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a -@@ -827,7 +256,7 @@ static const unsigned int cy_chip_offset[] = { 0x0000, +@@ -827,7 +256,7 @@ static const unsigned int cy_chip_offset /* PCI related definitions */ #ifdef CONFIG_PCI @@ -704,7 +693,7 @@ index 87a40bc..487b09b 100644 /* PCI < 1Mb */ { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) }, /* PCI > 1Mb */ -@@ -893,7 +322,7 @@ static inline bool cyz_is_loaded(struct cyclades_card *card) +@@ -893,7 +322,7 @@ static inline bool cyz_is_loaded(struct } static inline int serial_paranoia_check(struct cyclades_port *info, @@ -713,7 +702,7 @@ index 87a40bc..487b09b 100644 { #ifdef SERIAL_PARANOIA_CHECK if (!info) { -@@ -909,7 +338,7 @@ static inline int serial_paranoia_check(struct cyclades_port *info, +@@ -909,7 +338,7 @@ static inline int serial_paranoia_check( } #endif return 0; @@ -722,7 +711,7 @@ index 87a40bc..487b09b 100644 /***********************************************************/ /********* Start of block of Cyclom-Y specific code ********/ -@@ -3030,11 +2459,9 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty, +@@ -3030,11 +2459,9 @@ cy_set_serial_info(struct cyclades_port struct serial_struct __user *new_info) { struct serial_struct new_serial; @@ -734,7 +723,7 @@ index 87a40bc..487b09b 100644 if (!capable(CAP_SYS_ADMIN)) { if (new_serial.close_delay != info->port.close_delay || -@@ -3376,7 +2803,6 @@ static int cy_break(struct tty_struct *tty, int break_state) +@@ -3376,7 +2803,6 @@ static int cy_break(struct tty_struct *t static int get_mon_info(struct cyclades_port *info, struct cyclades_monitor __user *mon) { diff --git a/tty/tty-cyclades-fix-const-assign b/tty/tty-cyclades-fix-const-assign deleted file mode 100644 index e71fcda11e5661..00000000000000 --- a/tty/tty-cyclades-fix-const-assign +++ /dev/null @@ -1,28 +0,0 @@ -cyclades: Fix assign to const introduced int he cleanups - -From: Alan Cox <alan@linux.intel.com> - -"drivers/char/cyclades.c:3332: error: assignment of read-only location -(it's const)" - Randy Dunlap - - -Signed-off-by: Alan Cox <alan@linux.intel.com> ---- - - drivers/char/cyclades.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - - -diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c -index 415bc07..f518e0b 100644 ---- a/drivers/char/cyclades.c -+++ b/drivers/char/cyclades.c -@@ -144,7 +144,7 @@ static struct tty_driver *cy_serial_driver; - causing problems, remove the offending address from this table. - */ - --static const unsigned int cy_isa_addresses[] = { -+static unsigned int cy_isa_addresses[] = { - 0xD0000, - 0xD2000, - 0xD4000, diff --git a/tty/tty-cyclades-ioctl-cleanup b/tty/tty-cyclades-ioctl-cleanup index 93d713454f0c8d..8bf0133897be3c 100644 --- a/tty/tty-cyclades-ioctl-cleanup +++ b/tty/tty-cyclades-ioctl-cleanup @@ -1,4 +1,5 @@ -cyclades: ioctls cleanup +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: ioctls cleanup From: Jiri Slaby <jirislaby@gmail.com> @@ -14,6 +15,7 @@ From: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 179 ++++++++++++++++++----------------------------- diff --git a/tty/tty-cyclades-merge-startup-common b/tty/tty-cyclades-merge-startup-common index dbd097dca2004f..1b9cfe2b0c90ca 100644 --- a/tty/tty-cyclades-merge-startup-common +++ b/tty/tty-cyclades-merge-startup-common @@ -1,4 +1,5 @@ -cyclades: merge cy_startup tails +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: merge cy_startup tails From: Jiri Slaby <jirislaby@gmail.com> @@ -6,6 +7,7 @@ There is a duplicated code for Y and Z in cy_startup, merge the paths. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 45 ++++++++++++++++----------------------------- diff --git a/tty/tty-cyclades-modem-cleanup b/tty/tty-cyclades-modem-cleanup index 61b147f8c84058..11f9d54db14017 100644 --- a/tty/tty-cyclades-modem-cleanup +++ b/tty/tty-cyclades-modem-cleanup @@ -1,4 +1,5 @@ -cyclades: tiocm cleanup +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: tiocm cleanup From: Jiri Slaby <jirislaby@gmail.com> @@ -10,6 +11,7 @@ From: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 153 ++++++++++++++++++++--------------------------- diff --git a/tty/tty-cyclades-port-close b/tty/tty-cyclades-port-close index 709f18f7b6de85..8608b171ba16da 100644 --- a/tty/tty-cyclades-port-close +++ b/tty/tty-cyclades-port-close @@ -1,21 +1,21 @@ -cyclades: use the full port_close function +From: Alan Cox <alan@linux.intel.com> +Subject: cyclades: use the full port_close function From: Alan Cox <alan@linux.intel.com> Convert cyclades to use the full tty_port_close helper Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/char/cyclades.c | 32 +++++++++++++++----------------- - 1 files changed, 15 insertions(+), 17 deletions(-) + drivers/char/cyclades.c | 36 +++++++++++++++++------------------- + 1 file changed, 17 insertions(+), 19 deletions(-) -diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c -index f518e0b..73c269f 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c -@@ -1750,24 +1750,15 @@ static void cy_flush_buffer(struct tty_struct *tty) +@@ -1750,24 +1750,15 @@ static void cy_flush_buffer(struct tty_s } /* cy_flush_buffer */ @@ -23,7 +23,7 @@ index f518e0b..73c269f 100644 - * This routine is called when a particular tty device is closed. - */ -static void cy_close(struct tty_struct *tty, struct file *filp) -+static void cy_do_close(struct tty_port *port, struct tty_struct *tty) ++static void cy_do_close(struct tty_port *port) { - struct cyclades_port *info = tty->driver_data; + struct cyclades_port *info = container_of(port, struct cyclades_port, @@ -43,16 +43,26 @@ index f518e0b..73c269f 100644 channel = info->line - card->first_line; spin_lock_irqsave(&card->card_lock, flags); -@@ -1801,14 +1792,19 @@ static void cy_close(struct tty_struct *tty, struct file *filp) +@@ -1779,7 +1770,7 @@ static void cy_close(struct tty_struct * + /* Waiting for on-board buffers to be empty before + closing the port */ + spin_unlock_irqrestore(&card->card_lock, flags); +- cy_wait_until_sent(tty, info->timeout); ++ cy_wait_until_sent(port->tty, info->timeout); + spin_lock_irqsave(&card->card_lock, flags); + } + } else { +@@ -1801,14 +1792,19 @@ static void cy_close(struct tty_struct * } #endif } - spin_unlock_irqrestore(&card->card_lock, flags); - cy_shutdown(info, tty); +- cy_shutdown(info, tty); - cy_flush_buffer(tty); - - tty_port_tty_set(&info->port, NULL); ++ cy_shutdown(info, port->tty); +} - tty_port_close_end(&info->port, tty); @@ -68,7 +78,7 @@ index f518e0b..73c269f 100644 } /* cy_close */ /* This routine gets called when tty_write has put something into -@@ -3113,11 +3109,13 @@ static void cyz_dtr_rts(struct tty_port *port, int raise) +@@ -3113,11 +3109,13 @@ static void cyz_dtr_rts(struct tty_port static const struct tty_port_operations cyy_port_ops = { .carrier_raised = cyy_carrier_raised, .dtr_rts = cyy_dtr_rts, diff --git a/tty/tty-cyclades-precompute b/tty/tty-cyclades-precompute index aa0bebe934bf27..fcb4706b805811 100644 --- a/tty/tty-cyclades-precompute +++ b/tty/tty-cyclades-precompute @@ -1,4 +1,5 @@ -cyclades: avoid addresses recomputation +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: avoid addresses recomputation From: Jiri Slaby <jirislaby@gmail.com> @@ -12,6 +13,7 @@ This simplify code and improves readability. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 241 ++++++++++++++-------------------------------- diff --git a/tty/tty-cyclades-refcount b/tty/tty-cyclades-refcount index 616cc4b0aa3045..a678b706536ab2 100644 --- a/tty/tty-cyclades-refcount +++ b/tty/tty-cyclades-refcount @@ -1,4 +1,5 @@ -cyclades: add tty refcounting +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: add tty refcounting From: Jiri Slaby <jirislaby@gmail.com> @@ -19,6 +20,7 @@ cy_ to functions which don't have it yet. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 172 +++++++++++++++++++++++++---------------------- diff --git a/tty/tty-cyclades-remove-set-line-dups b/tty/tty-cyclades-remove-set-line-dups index 7d5dadb8a9f5bb..462e9e7a1719eb 100644 --- a/tty/tty-cyclades-remove-set-line-dups +++ b/tty/tty-cyclades-remove-set-line-dups @@ -1,4 +1,5 @@ -cyclades: remove more duplicated code +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: remove more duplicated code From: Jiri Slaby <jirislaby@gmail.com> @@ -10,6 +11,7 @@ of the code. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 45 ++++++++++++++------------------------------- diff --git a/tty/tty-cyclades-sleep-not-busy b/tty/tty-cyclades-sleep-not-busy index b48a3198c83de4..851f3e4fff46c5 100644 --- a/tty/tty-cyclades-sleep-not-busy +++ b/tty/tty-cyclades-sleep-not-busy @@ -1,4 +1,5 @@ -cyclades: sleep instead busy-wait +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: sleep instead busy-wait From: Jiri Slaby <jirislaby@gmail.com> @@ -6,6 +7,7 @@ Avoid long busy loops (5 ms) which may be replaced by sleeps. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 4 ++-- diff --git a/tty/tty-cyclades-use-dtr-helpers b/tty/tty-cyclades-use-dtr-helpers index 0bfdf137591765..4284cffb86498b 100644 --- a/tty/tty-cyclades-use-dtr-helpers +++ b/tty/tty-cyclades-use-dtr-helpers @@ -1,4 +1,5 @@ -cyclades: use dtr_rts helpers +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: use dtr_rts helpers From: Jiri Slaby <jirislaby@gmail.com> @@ -12,6 +13,7 @@ It may then be called with set/clear masks from other places. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 280 +++++++++++++---------------------------------- diff --git a/tty/tty-cyclades-use-port-block-helper b/tty/tty-cyclades-use-port-block-helper index 68be999f096719..8ed7137be9b231 100644 --- a/tty/tty-cyclades-use-port-block-helper +++ b/tty/tty-cyclades-use-port-block-helper @@ -1,4 +1,5 @@ -cyclades: remove block_til_ready +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: remove block_til_ready From: Jiri Slaby <jirislaby@gmail.com> @@ -10,6 +11,7 @@ that to not duplicate the code all over the place. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 302 +++++++++++++++++------------------------------ diff --git a/tty/tty-cyclades-use-port-close b/tty/tty-cyclades-use-port-close index 806981aa4e3351..51e7c387e67897 100644 --- a/tty/tty-cyclades-use-port-close +++ b/tty/tty-cyclades-use-port-close @@ -1,4 +1,5 @@ -cyclades: close cleanup +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: close cleanup From: Jiri Slaby <jirislaby@gmail.com> @@ -12,6 +13,7 @@ Remove also useless debug printks while being there. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 70 +---------------------------------------------- diff --git a/tty/tty-cyclades-use-port-hangup b/tty/tty-cyclades-use-port-hangup index 440ff0e6afcf87..d25a96bd553983 100644 --- a/tty/tty-cyclades-use-port-hangup +++ b/tty/tty-cyclades-use-port-hangup @@ -1,4 +1,5 @@ -cyclades: switch to tty_port_hangup +From: Jiri Slaby <jirislaby@gmail.com> +Subject: cyclades: switch to tty_port_hangup From: Jiri Slaby <jirislaby@gmail.com> @@ -11,6 +12,7 @@ right job. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/char/cyclades.c | 23 ++++++----------------- |