[parisc-linux-cvs] Remove GSC support from serial.c
Matthew Wilcox
willy@ldl.fc.hp.com
Tue, 06 Mar 2001 13:20:49 -0700
Remove gsc_* accesses from the serial driver.
Index: drivers/char/serial.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/char/serial.c,v
retrieving revision 1.18
diff -u -p -r1.18 serial.c
--- serial.c 2001/01/25 00:00:39 1.18
+++ serial.c 2001/03/06 17:50:49
@@ -417,10 +417,6 @@ static _INLINE_ unsigned int serial_in(s
case SERIAL_IO_MEM:
return readb((unsigned long) info->iomem_base +
(offset<<info->iomem_reg_shift));
-#ifdef CONFIG_SERIAL_GSC
- case SERIAL_IO_GSC:
- return gsc_readb(info->iomem_base + offset);
-#endif
default:
#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
return inb(info->port + offset);
@@ -444,11 +440,6 @@ static _INLINE_ void serial_out(struct a
writeb(value, (unsigned long) info->iomem_base +
(offset<<info->iomem_reg_shift));
break;
-#ifdef CONFIG_SERIAL_GSC
- case SERIAL_IO_GSC:
- gsc_writeb(value, info->iomem_base + offset);
- break;
-#endif
default:
#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
outb(value, info->port+offset);
Index: drivers/gsc/serial.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/gsc/serial.c,v
retrieving revision 1.8
diff -u -p -r1.8 serial.c
--- serial.c 2001/02/28 01:09:47 1.8
+++ serial.c 2001/03/06 17:50:49
@@ -66,13 +66,8 @@ serial_init_chip(struct hp_device *d, st
serial->line = serial_line_nr;
serial->iomem_base = (void*) (((unsigned long) d->hpa) + 0x800);
-#ifdef CONFIG_SERIAL_CONSOLE
- /* FIXME: inb/outb have been aliased to gsc_readb/writeb in serial.c */
- serial->port = (unsigned long) serial->iomem_base;
-#endif
-
serial->irq = irq;
- serial->io_type = SERIAL_IO_GSC; /* define access method */
+ serial->io_type = SERIAL_IO_MEM; /* define access method */
serial->flags = 0;
serial->xmit_fifo_size = 16;
serial->custom_divisor = 0;
Index: include/linux/serial.h
===================================================================
RCS file: /home/cvs/parisc/linux/include/linux/serial.h,v
retrieving revision 1.5
diff -u -p -r1.5 serial.h
--- serial.h 2000/11/10 21:44:53 1.5
+++ serial.h 2001/03/06 17:50:49
@@ -80,7 +80,6 @@ struct serial_struct {
#define SERIAL_IO_PORT 0
#define SERIAL_IO_HUB6 1
#define SERIAL_IO_MEM 2
-#define SERIAL_IO_GSC 3
struct serial_uart_config {
char *name;