Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

advansys: fix buggered formats - unsigned long != u32 on 64bit

asc_prt_line() had been hiding several places where formats had not
matched the argument types. The previous commit has finally made them
visible...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 31491e1a b59fb6fd

+13 -13
+13 -13
drivers/scsi/advansys.c
··· 3345 3345 shost->host_no); 3346 3346 3347 3347 seq_printf(m, 3348 - " host_busy %u, last_reset %u, max_id %u, max_lun %u, max_channel %u\n", 3348 + " host_busy %u, last_reset %lu, max_id %u, max_lun %u, max_channel %u\n", 3349 3349 shost->host_busy, shost->last_reset, shost->max_id, 3350 3350 shost->max_lun, shost->max_channel); 3351 3351 ··· 3359 3359 shost->unchecked_isa_dma, shost->use_clustering); 3360 3360 3361 3361 seq_printf(m, 3362 - " flags 0x%x, last_reset 0x%x, jiffies 0x%x, asc_n_io_port 0x%x\n", 3362 + " flags 0x%x, last_reset 0x%lx, jiffies 0x%lx, asc_n_io_port 0x%x\n", 3363 3363 boardp->flags, boardp->last_reset, jiffies, 3364 3364 boardp->asc_n_io_port); 3365 3365 3366 - seq_printf(m, " io_port 0x%x\n", shost->io_port); 3366 + seq_printf(m, " io_port 0x%lx\n", shost->io_port); 3367 3367 3368 3368 if (ASC_NARROW_BOARD(boardp)) { 3369 3369 chip_scsi_id = boardp->dvc_cfg.asc_dvc_cfg.chip_scsi_id; ··· 3539 3539 3540 3540 seq_printf(m, 3541 3541 " iop_base 0x%lx, cable_detect: %X, err_code %u\n", 3542 - v->iop_base, 3542 + (unsigned long)v->iop_base, 3543 3543 AdvReadWordRegister(iop_base,IOPW_SCSI_CFG1) & CABLE_DETECT, 3544 3544 v->err_code); 3545 3545 ··· 3670 3670 period = (((lramword >> 8) * 25) + 50) / 4; 3671 3671 3672 3672 if (period == 0) { /* Should never happen. */ 3673 - seq_printf(m, "%d (? Mhz), "); 3673 + seq_printf(m, "%d (? Mhz), ", period); 3674 3674 } else { 3675 3675 seq_printf(m, 3676 3676 "%d (%d.%d Mhz),", ··· 3711 3711 shost->host_no); 3712 3712 3713 3713 seq_printf(m, 3714 - " queuecommand %lu, reset %lu, biosparam %lu, interrupt %lu\n", 3714 + " queuecommand %u, reset %u, biosparam %u, interrupt %u\n", 3715 3715 s->queuecommand, s->reset, s->biosparam, 3716 3716 s->interrupt); 3717 3717 3718 3718 seq_printf(m, 3719 - " callback %lu, done %lu, build_error %lu, build_noreq %lu, build_nosg %lu\n", 3719 + " callback %u, done %u, build_error %u, build_noreq %u, build_nosg %u\n", 3720 3720 s->callback, s->done, s->build_error, 3721 3721 s->adv_build_noreq, s->adv_build_nosg); 3722 3722 3723 3723 seq_printf(m, 3724 - " exe_noerror %lu, exe_busy %lu, exe_error %lu, exe_unknown %lu\n", 3724 + " exe_noerror %u, exe_busy %u, exe_error %u, exe_unknown %u\n", 3725 3725 s->exe_noerror, s->exe_busy, s->exe_error, 3726 3726 s->exe_unknown); 3727 3727 ··· 3729 3729 * Display data transfer statistics. 3730 3730 */ 3731 3731 if (s->xfer_cnt > 0) { 3732 - seq_printf(m, " xfer_cnt %lu, xfer_elem %lu, ", 3732 + seq_printf(m, " xfer_cnt %u, xfer_elem %u, ", 3733 3733 s->xfer_cnt, s->xfer_elem); 3734 3734 3735 - seq_printf(m, "xfer_bytes %lu.%01lu kb\n", 3735 + seq_printf(m, "xfer_bytes %u.%01u kb\n", 3736 3736 s->xfer_sect / 2, ASC_TENTHS(s->xfer_sect, 2)); 3737 3737 3738 3738 /* Scatter gather transfer statistics */ 3739 - seq_printf(m, " avg_num_elem %lu.%01lu, ", 3739 + seq_printf(m, " avg_num_elem %u.%01u, ", 3740 3740 s->xfer_elem / s->xfer_cnt, 3741 3741 ASC_TENTHS(s->xfer_elem, s->xfer_cnt)); 3742 3742 3743 - seq_printf(m, "avg_elem_size %lu.%01lu kb, ", 3743 + seq_printf(m, "avg_elem_size %u.%01u kb, ", 3744 3744 (s->xfer_sect / 2) / s->xfer_elem, 3745 3745 ASC_TENTHS((s->xfer_sect / 2), s->xfer_elem)); 3746 3746 3747 - seq_printf(m, "avg_xfer_size %lu.%01lu kb\n", 3747 + seq_printf(m, "avg_xfer_size %u.%01u kb\n", 3748 3748 (s->xfer_sect / 2) / s->xfer_cnt, 3749 3749 ASC_TENTHS((s->xfer_sect / 2), s->xfer_cnt)); 3750 3750 }