Skip to content

Commit 1355cba

Browse files
Christoph Hellwiggregkh
authored andcommitted
tty/synclink: remove ISA support
The ISA support in this driver is horribly outdated and the last driver that passes a NULL dev argument to the DMA mapping routines. Drop the support, if someone wants to go through the work of converting it to a proper isa_driver we can resurrect it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 54b2f30 commit 1355cba

File tree

1 file changed

+0
-54
lines changed

1 file changed

+0
-54
lines changed

drivers/tty/synclink.c

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4325,41 +4325,6 @@ static int mgsl_init_tty(void)
43254325
return 0;
43264326
}
43274327

4328-
/* enumerate user specified ISA adapters
4329-
*/
4330-
static void mgsl_enum_isa_devices(void)
4331-
{
4332-
struct mgsl_struct *info;
4333-
int i;
4334-
4335-
/* Check for user specified ISA devices */
4336-
4337-
for (i=0 ;(i < MAX_ISA_DEVICES) && io[i] && irq[i]; i++){
4338-
if ( debug_level >= DEBUG_LEVEL_INFO )
4339-
printk("ISA device specified io=%04X,irq=%d,dma=%d\n",
4340-
io[i], irq[i], dma[i] );
4341-
4342-
info = mgsl_allocate_device();
4343-
if ( !info ) {
4344-
/* error allocating device instance data */
4345-
if ( debug_level >= DEBUG_LEVEL_ERROR )
4346-
printk( "can't allocate device instance data.\n");
4347-
continue;
4348-
}
4349-
4350-
/* Copy user configuration info to device instance data */
4351-
info->io_base = (unsigned int)io[i];
4352-
info->irq_level = (unsigned int)irq[i];
4353-
info->irq_level = irq_canonicalize(info->irq_level);
4354-
info->dma_level = (unsigned int)dma[i];
4355-
info->bus_type = MGSL_BUS_TYPE_ISA;
4356-
info->io_addr_size = 16;
4357-
info->irq_flags = 0;
4358-
4359-
mgsl_add_device( info );
4360-
}
4361-
}
4362-
43634328
static void synclink_cleanup(void)
43644329
{
43654330
int rc;
@@ -4403,7 +4368,6 @@ static int __init synclink_init(void)
44034368

44044369
printk("%s %s\n", driver_name, driver_version);
44054370

4406-
mgsl_enum_isa_devices();
44074371
if ((rc = pci_register_driver(&synclink_pci_driver)) < 0)
44084372
printk("%s:failed to register PCI driver, error=%d\n",__FILE__,rc);
44094373
else
@@ -5025,12 +4989,6 @@ static void usc_set_sdlc_mode( struct mgsl_struct *info )
50254989
info->mbre_bit = BIT8;
50264990
outw( BIT8, info->io_base ); /* set Master Bus Enable (DCAR) */
50274991

5028-
if (info->bus_type == MGSL_BUS_TYPE_ISA) {
5029-
/* Enable DMAEN (Port 7, Bit 14) */
5030-
/* This connects the DMA request signal to the ISA bus */
5031-
usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT15) & ~BIT14));
5032-
}
5033-
50344992
/* DMA Control Register (DCR)
50354993
*
50364994
* <15..14> 10 Priority mode = Alternating Tx/Rx
@@ -6007,12 +5965,6 @@ static void usc_set_async_mode( struct mgsl_struct *info )
60075965

60085966
usc_EnableMasterIrqBit( info );
60095967

6010-
if (info->bus_type == MGSL_BUS_TYPE_ISA) {
6011-
/* Enable INTEN (Port 6, Bit12) */
6012-
/* This connects the IRQ request signal to the ISA bus */
6013-
usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) & ~BIT12));
6014-
}
6015-
60165968
if (info->params.loopback) {
60175969
info->loopback_bits = 0x300;
60185970
outw(0x0300, info->io_base + CCAR);
@@ -6107,12 +6059,6 @@ static void usc_set_sync_mode( struct mgsl_struct *info )
61076059
usc_loopback_frame( info );
61086060
usc_set_sdlc_mode( info );
61096061

6110-
if (info->bus_type == MGSL_BUS_TYPE_ISA) {
6111-
/* Enable INTEN (Port 6, Bit12) */
6112-
/* This connects the IRQ request signal to the ISA bus */
6113-
usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) & ~BIT12));
6114-
}
6115-
61166062
usc_enable_aux_clock(info, info->params.clock_speed);
61176063

61186064
if (info->params.loopback)

0 commit comments

Comments
 (0)