aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2015-02-06 17:11:36 -0500
committerJames Bottomley <JBottomley@Odin.com>2015-04-09 21:07:37 -0400
commitdfd7c991f31261fb4fb14adf0479206b178d270d (patch)
tree45b56e4561ec82fcdc8b6115a7c39aa4b4d98205 /drivers/scsi
parentbdebe2241eb49bf2308571b6158fa5635b9e708e (diff)
aha1542: Remove aha1542_restart
aha1542_restart does nothing (except useless printk), remove it Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/aha1542.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 29ddcc993423..67fdd2fad9a7 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -321,22 +321,6 @@ static int aha1542_test_port(int bse, struct Scsi_Host *shpnt)
321 return 1; 321 return 1;
322} 322}
323 323
324static int aha1542_restart(struct Scsi_Host *shost)
325{
326 struct aha1542_hostdata *aha1542 = shost_priv(shost);
327 int i;
328 int count = 0;
329
330 for (i = 0; i < AHA1542_MAILBOXES; i++)
331 if (aha1542->SCint[i] &&
332 !(aha1542->SCint[i]->device->soft_reset)) {
333 count++;
334 }
335 printk(KERN_DEBUG "Potential to restart %d stalled commands...\n", count);
336
337 return 0;
338}
339
340/* A "high" level interrupt handler */ 324/* A "high" level interrupt handler */
341static void aha1542_intr_handle(struct Scsi_Host *shost) 325static void aha1542_intr_handle(struct Scsi_Host *shost)
342{ 326{
@@ -347,7 +331,6 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
347 unsigned long flags; 331 unsigned long flags;
348 Scsi_Cmnd *SCtmp; 332 Scsi_Cmnd *SCtmp;
349 int flag; 333 int flag;
350 int needs_restart;
351 struct mailbox *mb = aha1542->mb; 334 struct mailbox *mb = aha1542->mb;
352 struct ccb *ccb = aha1542->ccb; 335 struct ccb *ccb = aha1542->ccb;
353 336
@@ -369,7 +352,6 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
369 }; 352 };
370#endif 353#endif
371 number_serviced = 0; 354 number_serviced = 0;
372 needs_restart = 0;
373 355
374 while (1 == 1) { 356 while (1 == 1) {
375 flag = inb(INTRFLAGS(shost->io_port)); 357 flag = inb(INTRFLAGS(shost->io_port));
@@ -383,10 +365,8 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
383 printk("MBOF "); 365 printk("MBOF ");
384 if (flag & HACC) 366 if (flag & HACC)
385 printk("HACC "); 367 printk("HACC ");
386 if (flag & SCRD) { 368 if (flag & SCRD)
387 needs_restart = 1;
388 printk("SCRD "); 369 printk("SCRD ");
389 }
390 } 370 }
391 aha1542_intr_reset(shost->io_port); 371 aha1542_intr_reset(shost->io_port);
392 372
@@ -406,12 +386,8 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)
406 if (mb[mbi].status == 0) { 386 if (mb[mbi].status == 0) {
407 spin_unlock_irqrestore(&aha1542_lock, flags); 387 spin_unlock_irqrestore(&aha1542_lock, flags);
408 /* Hmm, no mail. Must have read it the last time around */ 388 /* Hmm, no mail. Must have read it the last time around */
409 if (!number_serviced && !needs_restart) 389 if (!number_serviced)
410 printk(KERN_WARNING "aha1542.c: interrupt received, but no mail.\n"); 390 printk(KERN_WARNING "aha1542.c: interrupt received, but no mail.\n");
411 /* We detected a reset. Restart all pending commands for
412 devices that use the hard reset option */
413 if (needs_restart)
414 aha1542_restart(shost);
415 return; 391 return;
416 }; 392 };
417 393