From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation•org>
Cc: linux-next@vger•kernel.org, Alan Cox <alan@lxorguk•ukuu.org.uk>,
LKML <linux-kernel@vger•kernel.org>,
ppc-dev <linuxppc-dev@ozlabs•org>
Subject: [PATCH] serial: fix struct uart_info change fallout
Date: Tue, 22 Jul 2008 10:25:20 +1000 [thread overview]
Message-ID: <20080722102520.ca801ab5.sfr@canb.auug.org.au> (raw)
Hi Linus, Alan,
Today's linux-next (actually just Linus' tree) build (powerpc
ppc64_defconfig) failed like this:
drivers/serial/serial_txx9.c: In function 'receive_chars':
drivers/serial/serial_txx9.c:275: error: 'struct uart_info' has no member named 'tty'
drivers/serial/icom.c: In function 'recv_interrupt':
drivers/serial/icom.c:733: error: 'struct uart_info' has no member named 'tty'
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/serial/icom.c | 2 +-
drivers/serial/serial_txx9.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 9c2df5c..2b7531d 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -730,7 +730,7 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
{
short int count, rcv_buff;
- struct tty_struct *tty = icom_port->uart_port.info->tty;
+ struct tty_struct *tty = icom_port->uart_port.info->port.tty;
unsigned short int status;
struct uart_icount *icount;
unsigned long offset;
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 7ad2192..8fcb4c5 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port)
static inline void
receive_chars(struct uart_txx9_port *up, unsigned int *status)
{
- struct tty_struct *tty = up->port.info->tty;
+ struct tty_struct *tty = up->port.info->port.tty;
unsigned char ch;
unsigned int disr = *status;
int max_count = 256;
--
1.5.6.2
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2008-07-22 0:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 0:25 Stephen Rothwell [this message]
2008-07-22 0:38 ` [PATCH] serial: fix struct uart_info change fallout Dave Jones
2008-07-22 1:34 ` Stephen Rothwell
2008-07-22 2:00 ` Alan Cox
2008-07-22 1:58 ` Alan Cox
2008-07-22 3:01 ` Stephen Rothwell
2008-07-22 10:44 ` Alan Cox
2008-07-22 15:49 ` Stephen Rothwell
2008-07-22 15:59 ` Alan Cox
2008-07-22 16:22 ` Stephen Rothwell
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=20080722102520.ca801ab5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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