hpt366: disallow Ultra133 for HPT374

[linux-2.6-omap-h63xx.git] / drivers / char / epca.c

diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 88fc24fc43928674ef24647a394a2348cd18c082..c6c56fb8ba5098f341692d16c698e39a383abda1 100644 (file)
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -209,7 +209,6 @@ static void digi_send_break(struct channel *ch, int msec);
 static void setup_empty_event(struct tty_struct *tty, struct channel *ch);
 void epca_setup(char *, int *);
 
-static int get_termio(struct tty_struct *, struct termio __user *);
 static int pc_write(struct tty_struct *, const unsigned char *, int);
 static int pc_init(void);
 static int init_PCI(void);
@@ -950,7 +949,7 @@ static int block_til_ready(struct tty_struct *tty,
 
        } /* End forever while  */
 
-       current->state = TASK_RUNNING;
+       __set_current_state(TASK_RUNNING);
        remove_wait_queue(&ch->open_wait, &wait);
        if (!tty_hung_up_p(filp))
                ch->count++;
@@ -2362,15 +2361,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
 
        switch (cmd) 
        { /* Begin switch cmd */
-
-#if 0  /* Handled by calling layer properly */
-               case TCGETS:
-                       if (copy_to_user(argp, tty->termios, sizeof(struct ktermios)))
-                               return -EFAULT;
-                       return 0;
-               case TCGETA:
-                       return get_termio(tty, argp);
-#endif
                case TCSBRK:    /* SVID version: non-zero arg --> no break */
                        retval = tty_check_change(tty);
                        if (retval)
@@ -2735,13 +2725,6 @@ static void setup_empty_event(struct tty_struct *tty, struct channel *ch)
        memoff(ch);
 } /* End setup_empty_event */
 
-/* --------------------- Begin get_termio ----------------------- */
-
-static int get_termio(struct tty_struct * tty, struct termio __user * termio)
-{ /* Begin get_termio */
-       return kernel_termios_to_user_termio(termio, tty->termios);
-} /* End get_termio */
-
 /* ---------------------- Begin epca_setup  -------------------------- */
 void epca_setup(char *str, int *ints)
 { /* Begin epca_setup */