diff options
Diffstat (limited to 'drivers/scsi/sym53c416.c')
-rw-r--r-- | drivers/scsi/sym53c416.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c index ebfddd40ce67..ef19adc67eff 100644 --- a/drivers/scsi/sym53c416.c +++ b/drivers/scsi/sym53c416.c | |||
@@ -785,26 +785,14 @@ int sym53c416_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)) | |||
785 | return 0; | 785 | return 0; |
786 | } | 786 | } |
787 | 787 | ||
788 | static int sym53c416_abort(Scsi_Cmnd *SCpnt) | ||
789 | { | ||
790 | return FAILED; | ||
791 | } | ||
792 | |||
793 | static int sym53c416_bus_reset(Scsi_Cmnd *SCpnt) | ||
794 | { | ||
795 | return FAILED; | ||
796 | } | ||
797 | |||
798 | static int sym53c416_device_reset(Scsi_Cmnd *SCpnt) | ||
799 | { | ||
800 | return FAILED; | ||
801 | } | ||
802 | |||
803 | static int sym53c416_host_reset(Scsi_Cmnd *SCpnt) | 788 | static int sym53c416_host_reset(Scsi_Cmnd *SCpnt) |
804 | { | 789 | { |
805 | int base; | 790 | int base; |
806 | int scsi_id = -1; | 791 | int scsi_id = -1; |
807 | int i; | 792 | int i; |
793 | unsigned long flags; | ||
794 | |||
795 | spin_lock_irqsave(&sym53c416_lock, flags); | ||
808 | 796 | ||
809 | /* printk("sym53c416_reset\n"); */ | 797 | /* printk("sym53c416_reset\n"); */ |
810 | base = SCpnt->device->host->io_port; | 798 | base = SCpnt->device->host->io_port; |
@@ -816,6 +804,8 @@ static int sym53c416_host_reset(Scsi_Cmnd *SCpnt) | |||
816 | outb(NOOP | PIO_MODE, base + COMMAND_REG); | 804 | outb(NOOP | PIO_MODE, base + COMMAND_REG); |
817 | outb(RESET_SCSI_BUS, base + COMMAND_REG); | 805 | outb(RESET_SCSI_BUS, base + COMMAND_REG); |
818 | sym53c416_init(base, scsi_id); | 806 | sym53c416_init(base, scsi_id); |
807 | |||
808 | spin_unlock_irqrestore(&sym53c416_lock, flags); | ||
819 | return SUCCESS; | 809 | return SUCCESS; |
820 | } | 810 | } |
821 | 811 | ||
@@ -865,10 +855,7 @@ static Scsi_Host_Template driver_template = { | |||
865 | .detect = sym53c416_detect, | 855 | .detect = sym53c416_detect, |
866 | .info = sym53c416_info, | 856 | .info = sym53c416_info, |
867 | .queuecommand = sym53c416_queuecommand, | 857 | .queuecommand = sym53c416_queuecommand, |
868 | .eh_abort_handler = sym53c416_abort, | ||
869 | .eh_host_reset_handler =sym53c416_host_reset, | 858 | .eh_host_reset_handler =sym53c416_host_reset, |
870 | .eh_bus_reset_handler = sym53c416_bus_reset, | ||
871 | .eh_device_reset_handler =sym53c416_device_reset, | ||
872 | .release = sym53c416_release, | 859 | .release = sym53c416_release, |
873 | .bios_param = sym53c416_bios_param, | 860 | .bios_param = sym53c416_bios_param, |
874 | .can_queue = 1, | 861 | .can_queue = 1, |