← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/scsi/eata_pio.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/scsi/eata_pio.c
372
372
        cp->status = USED;      /* claim free slot */
373
373
 
374
374
        DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,
375
 
                "eata_pio_queue pid %ld, y %d\n",
376
 
                cmd->serial_number, y));
 
375
                "eata_pio_queue 0x%p, y %d\n", cmd, y));
377
376
 
378
377
        cmd->scsi_done = (void *) done;
379
378
 
417
416
        if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) {
418
417
                cmd->result = DID_BUS_BUSY << 16;
419
418
                scmd_printk(KERN_NOTICE, cmd,
420
 
                        "eata_pio_queue pid %ld, HBA busy, "
421
 
                        "returning DID_BUS_BUSY, done.\n", cmd->serial_number);
 
419
                        "eata_pio_queue pid 0x%p, HBA busy, "
 
420
                        "returning DID_BUS_BUSY, done.\n", cmd);
422
421
                done(cmd);
423
422
                cp->status = FREE;
424
423
                return 0;
432
431
                outw(0, base + HA_RDATA);
433
432
 
434
433
        DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,
435
 
                "Queued base %#.4lx pid: %ld "
436
 
                "slot %d irq %d\n", sh->base, cmd->serial_number, y, sh->irq));
 
434
                "Queued base %#.4lx cmd: 0x%p "
 
435
                "slot %d irq %d\n", sh->base, cmd, y, sh->irq));
437
436
 
438
437
        return 0;
439
438
}
445
444
        unsigned int loop = 100;
446
445
 
447
446
        DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,
448
 
                "eata_pio_abort called pid: %ld\n",
449
 
                cmd->serial_number));
 
447
                "eata_pio_abort called pid: 0x%p\n", cmd));
450
448
 
451
449
        while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)
452
450
                if (--loop == 0) {
481
479
        struct Scsi_Host *host = cmd->device->host;
482
480
 
483
481
        DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,
484
 
                "eata_pio_reset called pid:%ld\n",
485
 
                cmd->serial_number));
 
482
                "eata_pio_reset called\n"));
486
483
 
487
484
        spin_lock_irq(host->host_lock);
488
485
 
501
498
 
502
499
                sp = HD(cmd)->ccb[x].cmd;
503
500
                HD(cmd)->ccb[x].status = RESET;
504
 
                printk(KERN_WARNING "eata_pio_reset: slot %d in reset, pid %ld.\n", x, sp->serial_number);
 
501
                printk(KERN_WARNING "eata_pio_reset: slot %d in reset.\n", x);
505
502
 
506
503
                if (sp == NULL)
507
504
                        panic("eata_pio_reset: slot %d, sp==NULL.\n", x);