[POWERPC] Update swim3 printk after blkdev.h change (14b1ffb5) · Commits · 戴 / test

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>

drivers/block/swim3.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -636,7 +636,7 @@ static irqreturn_t swim3_interrupt(int irq, void dev_id, struct pt_regs regs)
		intr = in_8(&sw->intr);
		err = (intr & ERROR_INTR)? in_8(&sw->error): 0;
		if ((intr & ERROR_INTR) && fs->state != do_transfer)
		printk(KERN_ERR "swim3_interrupt, state=%d, dir=%lx, intr=%x, err=%x\n",
		printk(KERN_ERR "swim3_interrupt, state=%d, dir=%x, intr=%x, err=%x\n",
		fs->state, rq_data_dir(fd_req), intr, err);
		switch (fs->state) {
		case locating:
		@@ -742,7 +742,7 @@ static irqreturn_t swim3_interrupt(int irq, void dev_id, struct pt_regs regs)
		if ((stat & ACTIVE) == 0 \|\| resid != 0) {
		/* musta been an error */
		printk(KERN_ERR "swim3: fd dma: stat=%x resid=%d\n", stat, resid);
		printk(KERN_ERR " state=%d, dir=%lx, intr=%x, err=%x\n",
		printk(KERN_ERR " state=%d, dir=%x, intr=%x, err=%x\n",
		fs->state, rq_data_dir(fd_req), intr, err);
		end_request(fd_req, 0);
		fs->state = idle;

Admin message