* [PATCH] Compile fix and cleanup for macserial driver
@ 2003-07-07 11:14 Paul Mackerras
0 siblings, 0 replies; only message in thread
From: Paul Mackerras @ 2003-07-07 11:14 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus,
This patch adds a declaration that the macserial driver needs in order
to compile correctly, and removes some old SERIAL_DO_RESTART junk
which isn't used (SERIAL_DO_RESTART is never defined in this driver)
and which I think is incorrect anyway, since it looks to me like it
would potentially return an ERESTARTSYS error without a signal
pending.
Please apply. This patch is OK with Ben Herrenschmidt.
Thanks,
Paul.
diff -urN linux-2.5/drivers/macintosh/macserial.c pmac-2.5/drivers/macintosh/macserial.c
--- linux-2.5/drivers/macintosh/macserial.c 2003-06-12 20:27:47.000000000 +1000
+++ pmac-2.5/drivers/macintosh/macserial.c 2003-06-17 21:57:19.000000000 +1000
@@ -76,6 +76,8 @@
in the order we want. */
#define RECOVERY_DELAY eieio()
+static struct tty_driver *serial_driver;
+
struct mac_zschannel zs_channels[NUM_CHANNELS];
struct mac_serial zs_soft[NUM_CHANNELS];
@@ -2093,12 +2095,7 @@
*/
if (info->flags & ZILOG_CLOSING) {
interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
- return ((info->flags & ZILOG_HUP_NOTIFY) ?
- -EAGAIN : -ERESTARTSYS);
-#else
return -EAGAIN;
-#endif
}
/*
@@ -2139,14 +2136,7 @@
set_current_state(TASK_INTERRUPTIBLE);
if (tty_hung_up_p(filp) ||
!(info->flags & ZILOG_INITIALIZED)) {
-#ifdef SERIAL_DO_RESTART
- if (info->flags & ZILOG_HUP_NOTIFY)
- retval = -EAGAIN;
- else
- retval = -ERESTARTSYS;
-#else
retval = -EAGAIN;
-#endif
break;
}
if (!(info->flags & ZILOG_CLOSING) &&
@@ -2222,12 +2212,7 @@
(info->flags & ZILOG_CLOSING)) {
if (info->flags & ZILOG_CLOSING)
interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
- return ((info->flags & ZILOG_HUP_NOTIFY) ?
- -EAGAIN : -ERESTARTSYS);
-#else
return -EAGAIN;
-#endif
}
/*
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-07-07 11:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-07 11:14 [PATCH] Compile fix and cleanup for macserial driver Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).