diff options
Diffstat (limited to 'drivers/scsi/pcmcia/sym53c500_cs.c')
-rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index e7564d8f0cbf..a51164171179 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -191,7 +191,6 @@ | |||
191 | 191 | ||
192 | struct scsi_info_t { | 192 | struct scsi_info_t { |
193 | struct pcmcia_device *p_dev; | 193 | struct pcmcia_device *p_dev; |
194 | dev_node_t node; | ||
195 | struct Scsi_Host *host; | 194 | struct Scsi_Host *host; |
196 | unsigned short manf_id; | 195 | unsigned short manf_id; |
197 | }; | 196 | }; |
@@ -719,8 +718,7 @@ SYM53C500_config(struct pcmcia_device *link) | |||
719 | if (ret) | 718 | if (ret) |
720 | goto failed; | 719 | goto failed; |
721 | 720 | ||
722 | ret = pcmcia_request_irq(link, &link->irq); | 721 | if (!link->irq) |
723 | if (ret) | ||
724 | goto failed; | 722 | goto failed; |
725 | 723 | ||
726 | ret = pcmcia_request_configuration(link, &link->conf); | 724 | ret = pcmcia_request_configuration(link, &link->conf); |
@@ -752,7 +750,7 @@ SYM53C500_config(struct pcmcia_device *link) | |||
752 | * 0x320, 0x330, 0x340, 0x350 | 750 | * 0x320, 0x330, 0x340, 0x350 |
753 | */ | 751 | */ |
754 | port_base = link->io.BasePort1; | 752 | port_base = link->io.BasePort1; |
755 | irq_level = link->irq.AssignedIRQ; | 753 | irq_level = link->irq; |
756 | 754 | ||
757 | DEB(printk("SYM53C500: port_base=0x%x, irq=%d, fast_pio=%d\n", | 755 | DEB(printk("SYM53C500: port_base=0x%x, irq=%d, fast_pio=%d\n", |
758 | port_base, irq_level, USE_FAST_PIO);) | 756 | port_base, irq_level, USE_FAST_PIO);) |
@@ -793,8 +791,6 @@ SYM53C500_config(struct pcmcia_device *link) | |||
793 | */ | 791 | */ |
794 | data->fast_pio = USE_FAST_PIO; | 792 | data->fast_pio = USE_FAST_PIO; |
795 | 793 | ||
796 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | ||
797 | link->dev_node = &info->node; | ||
798 | info->host = host; | 794 | info->host = host; |
799 | 795 | ||
800 | if (scsi_add_host(host, NULL)) | 796 | if (scsi_add_host(host, NULL)) |
@@ -866,7 +862,6 @@ SYM53C500_probe(struct pcmcia_device *link) | |||
866 | link->io.NumPorts1 = 16; | 862 | link->io.NumPorts1 = 16; |
867 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 863 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
868 | link->io.IOAddrLines = 10; | 864 | link->io.IOAddrLines = 10; |
869 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | ||
870 | link->conf.Attributes = CONF_ENABLE_IRQ; | 865 | link->conf.Attributes = CONF_ENABLE_IRQ; |
871 | link->conf.IntType = INT_MEMORY_AND_IO; | 866 | link->conf.IntType = INT_MEMORY_AND_IO; |
872 | 867 | ||