Commit b85a1f8b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

drop scsi_register_blocked_host()

parent aefd59bb
...@@ -1228,7 +1228,6 @@ static int port_detect \ ...@@ -1228,7 +1228,6 @@ static int port_detect \
sh[j]->unchecked_isa_dma = FALSE; sh[j]->unchecked_isa_dma = FALSE;
else { else {
unsigned long flags; unsigned long flags;
scsi_register_blocked_host(sh[j]);
sh[j]->unchecked_isa_dma = TRUE; sh[j]->unchecked_isa_dma = TRUE;
flags=claim_dma_lock(); flags=claim_dma_lock();
...@@ -2353,8 +2352,6 @@ static int eata2x_release(struct Scsi_Host *shpnt) { ...@@ -2353,8 +2352,6 @@ static int eata2x_release(struct Scsi_Host *shpnt) {
if (sh[j] == NULL) panic("%s: release, invalid Scsi_Host pointer.\n", if (sh[j] == NULL) panic("%s: release, invalid Scsi_Host pointer.\n",
driver_name); driver_name);
if(sh[j]->unchecked_isa_dma) scsi_deregister_blocked_host(sh[j]);
for (i = 0; i < sh[j]->can_queue; i++) for (i = 0; i < sh[j]->can_queue; i++)
if ((&HD(j)->cp[i])->sglist) kfree((&HD(j)->cp[i])->sglist); if ((&HD(j)->cp[i])->sglist) kfree((&HD(j)->cp[i])->sglist);
......
...@@ -515,8 +515,6 @@ extern Scsi_Device * scsi_get_host_dev(struct Scsi_Host *); ...@@ -515,8 +515,6 @@ extern Scsi_Device * scsi_get_host_dev(struct Scsi_Host *);
extern void scsi_unblock_requests(struct Scsi_Host *); extern void scsi_unblock_requests(struct Scsi_Host *);
extern void scsi_block_requests(struct Scsi_Host *); extern void scsi_block_requests(struct Scsi_Host *);
extern void scsi_report_bus_reset(struct Scsi_Host *, int); extern void scsi_report_bus_reset(struct Scsi_Host *, int);
extern void scsi_register_blocked_host(struct Scsi_Host *);
extern void scsi_deregister_blocked_host(struct Scsi_Host *);
static inline void scsi_assign_lock(struct Scsi_Host *shost, spinlock_t *lock) static inline void scsi_assign_lock(struct Scsi_Host *shost, spinlock_t *lock)
{ {
......
...@@ -1340,23 +1340,6 @@ void scsi_report_bus_reset(struct Scsi_Host *shost, int channel) ...@@ -1340,23 +1340,6 @@ void scsi_report_bus_reset(struct Scsi_Host *shost, int channel)
} }
} }
/*
* FIXME(eric) - these are empty stubs for the moment. I need to re-implement
* host blocking from scratch. The theory is that hosts that wish to block
* will register/deregister using these functions instead of the old way
* of setting the wish_block flag.
*
* The details of the implementation remain to be settled, however the
* stubs are here now so that the actual drivers will properly compile.
*/
void scsi_register_blocked_host(struct Scsi_Host * shost)
{
}
void scsi_deregister_blocked_host(struct Scsi_Host * shost)
{
}
int __init scsi_init_queue(void) int __init scsi_init_queue(void)
{ {
int i; int i;
......
...@@ -74,8 +74,6 @@ EXPORT_SYMBOL(scsi_sleep); ...@@ -74,8 +74,6 @@ EXPORT_SYMBOL(scsi_sleep);
EXPORT_SYMBOL(scsi_io_completion); EXPORT_SYMBOL(scsi_io_completion);
EXPORT_SYMBOL(scsi_register_blocked_host);
EXPORT_SYMBOL(scsi_deregister_blocked_host);
EXPORT_SYMBOL(scsi_slave_attach); EXPORT_SYMBOL(scsi_slave_attach);
EXPORT_SYMBOL(scsi_slave_detach); EXPORT_SYMBOL(scsi_slave_detach);
EXPORT_SYMBOL(scsi_device_get); EXPORT_SYMBOL(scsi_device_get);
......
...@@ -905,7 +905,6 @@ static int port_detect \ ...@@ -905,7 +905,6 @@ static int port_detect \
} }
else { else {
unsigned long flags; unsigned long flags;
scsi_register_blocked_host(sh[j]);
sh[j]->unchecked_isa_dma = TRUE; sh[j]->unchecked_isa_dma = TRUE;
flags=claim_dma_lock(); flags=claim_dma_lock();
...@@ -1911,8 +1910,6 @@ static int u14_34f_release(struct Scsi_Host *shpnt) { ...@@ -1911,8 +1910,6 @@ static int u14_34f_release(struct Scsi_Host *shpnt) {
if (sh[j] == NULL) panic("%s: release, invalid Scsi_Host pointer.\n", if (sh[j] == NULL) panic("%s: release, invalid Scsi_Host pointer.\n",
driver_name); driver_name);
if(sh[j]->unchecked_isa_dma) scsi_deregister_blocked_host(sh[j]);
for (i = 0; i < sh[j]->can_queue; i++) for (i = 0; i < sh[j]->can_queue; i++)
if ((&HD(j)->cp[i])->sglist) kfree((&HD(j)->cp[i])->sglist); if ((&HD(j)->cp[i])->sglist) kfree((&HD(j)->cp[i])->sglist);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment