From: Jiri Slaby <jirislaby@gmail.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: gregkh@suse.de, linux-kernel@vger.kernel.org, alan@linux.intel.com
Subject: Re: [PATCH 3/5] TTY: use tty_standard_install
Date: Wed, 01 Feb 2012 10:52:35 +0100 [thread overview]
Message-ID: <4F290B63.9090101@gmail.com> (raw)
In-Reply-To: <4F290877.8050406@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
On 02/01/2012 10:40 AM, Jiri Slaby wrote:
> On 01/30/2012 09:14 PM, Jiri Slaby wrote:
>> Use the helper in the rest of the tty drivers. This is a simple
>> replacement.
>>
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
>> Cc: Greg Kroah-Hartman <gregkh@suse.de>
>> Cc: Alan Cox <alan@linux.intel.com>
>> ---
>> drivers/isdn/capi/capi.c | 9 +++------
>> drivers/misc/pti.c | 6 +-----
>> drivers/mmc/card/sdio_uart.c | 9 +++------
>> drivers/tty/nozomi.c | 8 ++------
>> 4 files changed, 9 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
>> index e44933d..ca9261a 100644
>> --- a/drivers/isdn/capi/capi.c
>> +++ b/drivers/isdn/capi/capi.c
>> @@ -1015,14 +1015,11 @@ capinc_tty_install(struct tty_driver *driver, struct tty_struct *tty)
>> {
>> int idx = tty->index;
>> struct capiminor *mp = capiminor_get(idx);
>> - int ret = tty_init_termios(tty);
>> + int ret = tty_standard_install(tty);
>
> Uh, what version of the patch did I send? tty_standard_install takes 2
> arguments! I will post the correct one in a moment.
If my ISP's smtp server actually worked now. The patch is attached,
hopefully my mailer won't screw it.
thanks,
--
js
[-- Attachment #2: 0003-TTY-use-tty_standard_install.patch --]
[-- Type: text/x-patch, Size: 3139 bytes --]
>From fa0824d0cc22bafe62137b2b33998c8d55ce2ac5 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 23 Nov 2011 22:31:01 +0100
Subject: [PATCH v2 3/5] TTY: use tty_standard_install
Use the helper in the rest of the tty drivers. This is a simple
replacement.
[v2] with correct number of parameters...
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Alan Cox <alan@linux.intel.com>
---
drivers/isdn/capi/capi.c | 9 +++------
drivers/misc/pti.c | 6 +-----
drivers/mmc/card/sdio_uart.c | 9 +++------
drivers/tty/nozomi.c | 8 ++------
4 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index e44933d..94948be 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1015,14 +1015,11 @@ capinc_tty_install(struct tty_driver *driver, struct tty_struct *tty)
{
int idx = tty->index;
struct capiminor *mp = capiminor_get(idx);
- int ret = tty_init_termios(tty);
+ int ret = tty_standard_install(driver, tty);
- if (ret == 0) {
- tty_driver_kref_get(driver);
- tty->count++;
+ if (ret == 0)
tty->driver_data = mp;
- driver->ttys[idx] = tty;
- } else
+ else
capiminor_put(mp);
return ret;
}
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 0b56e3f..471ff4c 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -481,13 +481,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty)
{
int idx = tty->index;
struct pti_tty *pti_tty_data;
- int ret = tty_init_termios(tty);
+ int ret = tty_standard_install(driver, tty);
if (ret == 0) {
- tty_driver_kref_get(driver);
- tty->count++;
- driver->ttys[idx] = tty;
-
pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL);
if (pti_tty_data == NULL)
return -ENOMEM;
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 2c151e1..bd4a67c 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -750,15 +750,12 @@ static int sdio_uart_install(struct tty_driver *driver, struct tty_struct *tty)
{
int idx = tty->index;
struct sdio_uart_port *port = sdio_uart_port_get(idx);
- int ret = tty_init_termios(tty);
+ int ret = tty_standard_install(driver, tty);
- if (ret == 0) {
- tty_driver_kref_get(driver);
- tty->count++;
+ if (ret == 0)
/* This is the ref sdio_uart_port get provided */
tty->driver_data = port;
- driver->ttys[idx] = tty;
- } else
+ else
sdio_uart_port_put(port);
return ret;
}
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index fd347ff..580da78 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1602,13 +1602,9 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
int ret;
if (!port || !dc || dc->state != NOZOMI_STATE_READY)
return -ENODEV;
- ret = tty_init_termios(tty);
- if (ret == 0) {
- tty_driver_kref_get(driver);
- tty->count++;
+ ret = tty_standard_install(driver, tty);
+ if (ret == 0)
tty->driver_data = port;
- driver->ttys[tty->index] = tty;
- }
return ret;
}
--
1.7.8.3
next prev parent reply other threads:[~2012-02-01 9:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 20:14 [PATCH 1/5] TTY: provide tty_standard_install helper Jiri Slaby
2012-01-30 20:14 ` [PATCH 2/5] USB: serial, use tty_standard_install Jiri Slaby
2012-01-30 20:14 ` [PATCH 3/5] TTY: " Jiri Slaby
2012-01-30 20:37 ` Alan Cox
2012-02-01 9:40 ` Jiri Slaby
2012-02-01 9:52 ` Jiri Slaby [this message]
2012-02-02 23:05 ` Greg KH
2012-02-02 23:23 ` Jiri Slaby
2012-02-02 23:49 ` Greg KH
2012-01-30 20:14 ` [PATCH 4/5] TTY: pty, remove superfluous ptm test Jiri Slaby
2012-01-30 20:37 ` Alan Cox
2012-01-30 20:14 ` [PATCH 5/5] TTY: get rid of BTM around devpts_* Jiri Slaby
2012-01-30 20:36 ` [PATCH 1/5] TTY: provide tty_standard_install helper 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=4F290B63.9090101@gmail.com \
--to=jirislaby@gmail.com \
--cc=alan@linux.intel.com \
--cc=gregkh@suse.de \
--cc=jslaby@suse.cz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.