Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / eata_pio.c

diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 4a9641e69f54853860e9f6b82999c0955fcb00e4..d5f8362335d305aef18864234f598057f0ce5fca 100644 (file)
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -372,8 +372,7 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd,
        cp->status = USED;      /* claim free slot */
 
        DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,
-               "eata_pio_queue pid %ld, y %d\n",
-               cmd->serial_number, y));
+               "eata_pio_queue 0x%p, y %d\n", cmd, y));
 
        cmd->scsi_done = (void *) done;
 
@@ -417,8 +416,8 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd,
        if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) {
                cmd->result = DID_BUS_BUSY << 16;
                scmd_printk(KERN_NOTICE, cmd,
-                       "eata_pio_queue pid %ld, HBA busy, "
-                       "returning DID_BUS_BUSY, done.\n", cmd->serial_number);
+                       "eata_pio_queue pid 0x%p, HBA busy, "
+                       "returning DID_BUS_BUSY, done.\n", cmd);
                done(cmd);
                cp->status = FREE;
                return 0;
@@ -432,8 +431,8 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd,
                outw(0, base + HA_RDATA);
 
        DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,
-               "Queued base %#.4lx pid: %ld "
-               "slot %d irq %d\n", sh->base, cmd->serial_number, y, sh->irq));
+               "Queued base %#.4lx cmd: 0x%p "
+               "slot %d irq %d\n", sh->base, cmd, y, sh->irq));
 
        return 0;
 }
@@ -445,8 +444,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd)
        unsigned int loop = 100;
 
        DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,
-               "eata_pio_abort called pid: %ld\n",
-               cmd->serial_number));
+               "eata_pio_abort called pid: 0x%p\n", cmd));
 
        while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)
                if (--loop == 0) {
@@ -481,8 +479,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
        struct Scsi_Host *host = cmd->device->host;
 
        DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,
-               "eata_pio_reset called pid:%ld\n",
-               cmd->serial_number));
+               "eata_pio_reset called\n"));
 
        spin_lock_irq(host->host_lock);
 
@@ -501,7 +498,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
 
                sp = HD(cmd)->ccb[x].cmd;
                HD(cmd)->ccb[x].status = RESET;
-               printk(KERN_WARNING "eata_pio_reset: slot %d in reset, pid %ld.\n", x, sp->serial_number);
+               printk(KERN_WARNING "eata_pio_reset: slot %d in reset.\n", x);
 
                if (sp == NULL)
                        panic("eata_pio_reset: slot %d, sp==NULL.\n", x);