[PATCH] Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline

[PATCH] Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline

[David Howells]

Fix the epca driver to call epca_setup() if digiepca=xxx is included on the
command line and the epca driver is built in.

epca_setup() used to be called from init/main.c in 2.2 kernels, but somewhere
along the way that call was removed but not replaced.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 drivers/char/epca.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)


diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 60a4df7..96a4b6b 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -186,7 +186,6 @@ static void pc_throttle(struct tty_struct *tty);
 static void pc_unthrottle(struct tty_struct *tty);
 static void digi_send_break(struct channel *ch, int msec);
 static void setup_empty_event(struct tty_struct *tty, struct channel *ch);
-static void epca_setup(char *, int *);
 
 static int pc_write(struct tty_struct *, const unsigned char *, int);
 static int pc_init(void);
@@ -2538,7 +2537,8 @@ static void setup_empty_event(struct tty_struct *tty, struct channel *ch)
 	memoff(ch);
 }
 
-static void epca_setup(char *str, int *ints)
+#ifndef MODULE
+static void __init epca_setup(char *str, int *ints)
 {
 	struct board_info board;
 	int               index, loop, last;
@@ -2792,6 +2792,17 @@ static void epca_setup(char *str, int *ints)
 	num_cards++;
 }
 
+static int __init epca_real_setup(char *str)
+{
+	int ints[11];
+
+	epca_setup(get_options(str, 11, ints), ints);
+	return 1;
+}
+
+__setup("digiepca", epca_real_setup);
+#endif
+
 enum epic_board_types {
 	brd_xr = 0,
 	brd_xem,

Re: [PATCH] Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline

[Alan Cox]

On Wed, 09 Jul 2008 14:19:28 +0100
David Howells <dhowells@redhat.com> wrote:

> Fix the epca driver to call epca_setup() if digiepca=xxx is included on the
> command line and the epca driver is built in.
> 
> epca_setup() used to be called from init/main.c in 2.2 kernels, but somewhere
> along the way that call was removed but not replaced.

Acked-by: Alan Cox <alan@redhat.com>

Will add to the ttydev tree.

Alan

Re: [PATCH] Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline

[Andrew Morton]

On Wed, 9 Jul 2008 15:39:06 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:

> Will add to the ttydev tree.

What is the scope/mandate of that tree?


coz I'm wondering about

remove-is_tty.patch

pty-remove-unused-unix98_pty_count-options.patch

proper-extern-for-mwave_s_mdd.patch
if-0-hpet_unregister.patch
efirtc-push-down-the-bkl.patch
ip2-push-bkl-down-for-the-firmware-interface.patch
mwave-ioctl-bkl-pushdown.patch
rio-push-down-the-bkl-into-the-firmware-ioctl-handler.patch
sx-push-bkl-down-into-the-firmware-ioctl-handler.patch
ixj-push-bkl-into-driver-and-wrap-ioctls.patch
ppdev-wrap-ioctl-handler-in-driver-and-push-lock-down.patch
ds1302-push-down-the-bkl-into-the-driver-ioctl-code.patch
dsp56k-bkl-pushdown.patch
nwflash-use-simple_read_from_buffer.patch
char-mxser-ioctl-cleanup.patch
char-mxser-globals-cleanup.patch
char-mxser-update-documentation.patch
char-mxser-prints-cleanup.patch
char-mxser-remove-predefined-isa-support.patch
char-mxser-various-cleanups.patch

Re: [PATCH] Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline

[Alan Cox]

On Wed, 9 Jul 2008 14:54:58 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Wed, 9 Jul 2008 15:39:06 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> 
> > Will add to the ttydev tree.
> 
> What is the scope/mandate of that tree?

TTY stuff - thro me any other tty bits you've got and I'll sort them out:
However none of

nwflash-use-simple_read_from_buffer.patch
dsp56k-bkl-pushdown.patch
ppdev-wrap-ioctl-handler-in-driver-and-push-lock-down.patch
if-0-hpet_unregister.patch
efirtc-push-down-the-bkl.patch

appear to be tty patches

Alan