diff options
author | Olaf Hering <olaf@aepfle.de> | 2006-10-02 16:57:23 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-04 00:52:13 -0400 |
commit | 14b1ffb577a8678e228683bd015302cfe964040c (patch) | |
tree | b6d72f5a6feea23aa4a97920089a9b0ce2d734e4 /drivers/block | |
parent | 2e194583125bfea94d1ceaa6a32e891643befa7d (diff) |
[POWERPC] Update swim3 printk after blkdev.h change
drivers/block/swim3.c: In function 'swim3_interrupt':
drivers/block/swim3.c:640: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int'
drivers/block/swim3.c:746: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int'
Update printk format string after blkdev.h change:
Split struct request ->flags into two parts
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/swim3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index f2305ee792a1..fdc8f892eb86 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
@@ -636,7 +636,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
636 | intr = in_8(&sw->intr); | 636 | intr = in_8(&sw->intr); |
637 | err = (intr & ERROR_INTR)? in_8(&sw->error): 0; | 637 | err = (intr & ERROR_INTR)? in_8(&sw->error): 0; |
638 | if ((intr & ERROR_INTR) && fs->state != do_transfer) | 638 | if ((intr & ERROR_INTR) && fs->state != do_transfer) |
639 | printk(KERN_ERR "swim3_interrupt, state=%d, dir=%lx, intr=%x, err=%x\n", | 639 | printk(KERN_ERR "swim3_interrupt, state=%d, dir=%x, intr=%x, err=%x\n", |
640 | fs->state, rq_data_dir(fd_req), intr, err); | 640 | fs->state, rq_data_dir(fd_req), intr, err); |
641 | switch (fs->state) { | 641 | switch (fs->state) { |
642 | case locating: | 642 | case locating: |
@@ -742,7 +742,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
742 | if ((stat & ACTIVE) == 0 || resid != 0) { | 742 | if ((stat & ACTIVE) == 0 || resid != 0) { |
743 | /* musta been an error */ | 743 | /* musta been an error */ |
744 | printk(KERN_ERR "swim3: fd dma: stat=%x resid=%d\n", stat, resid); | 744 | printk(KERN_ERR "swim3: fd dma: stat=%x resid=%d\n", stat, resid); |
745 | printk(KERN_ERR " state=%d, dir=%lx, intr=%x, err=%x\n", | 745 | printk(KERN_ERR " state=%d, dir=%x, intr=%x, err=%x\n", |
746 | fs->state, rq_data_dir(fd_req), intr, err); | 746 | fs->state, rq_data_dir(fd_req), intr, err); |
747 | end_request(fd_req, 0); | 747 | end_request(fd_req, 0); |
748 | fs->state = idle; | 748 | fs->state = idle; |