aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/advansys.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-03-31 03:04:13 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-04-09 14:13:22 -0400
commit31491e1ac425edc6b80a670a71ac8d2dfdd78417 (patch)
treed7b7c4caef3764bae3ab3e871bc27dd81d8cbb43 /drivers/scsi/advansys.c
parentb59fb6fdce14bbec226cc4a4b5a4511a715ea6c2 (diff)
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>
Diffstat (limited to 'drivers/scsi/advansys.c')
-rw-r--r--drivers/scsi/advansys.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 9029a208b9c3..c67e401954c5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -3345,7 +3345,7 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)
3345 shost->host_no); 3345 shost->host_no);
3346 3346
3347 seq_printf(m, 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 shost->host_busy, shost->last_reset, shost->max_id, 3349 shost->host_busy, shost->last_reset, shost->max_id,
3350 shost->max_lun, shost->max_channel); 3350 shost->max_lun, shost->max_channel);
3351 3351
@@ -3359,11 +3359,11 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)
3359 shost->unchecked_isa_dma, shost->use_clustering); 3359 shost->unchecked_isa_dma, shost->use_clustering);
3360 3360
3361 seq_printf(m, 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 boardp->flags, boardp->last_reset, jiffies, 3363 boardp->flags, boardp->last_reset, jiffies,
3364 boardp->asc_n_io_port); 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 if (ASC_NARROW_BOARD(boardp)) { 3368 if (ASC_NARROW_BOARD(boardp)) {
3369 chip_scsi_id = boardp->dvc_cfg.asc_dvc_cfg.chip_scsi_id; 3369 chip_scsi_id = boardp->dvc_cfg.asc_dvc_cfg.chip_scsi_id;
@@ -3539,7 +3539,7 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost)
3539 3539
3540 seq_printf(m, 3540 seq_printf(m,
3541 " iop_base 0x%lx, cable_detect: %X, err_code %u\n", 3541 " iop_base 0x%lx, cable_detect: %X, err_code %u\n",
3542 v->iop_base, 3542 (unsigned long)v->iop_base,
3543 AdvReadWordRegister(iop_base,IOPW_SCSI_CFG1) & CABLE_DETECT, 3543 AdvReadWordRegister(iop_base,IOPW_SCSI_CFG1) & CABLE_DETECT,
3544 v->err_code); 3544 v->err_code);
3545 3545
@@ -3670,7 +3670,7 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost)
3670 period = (((lramword >> 8) * 25) + 50) / 4; 3670 period = (((lramword >> 8) * 25) + 50) / 4;
3671 3671
3672 if (period == 0) { /* Should never happen. */ 3672 if (period == 0) { /* Should never happen. */
3673 seq_printf(m, "%d (? Mhz), "); 3673 seq_printf(m, "%d (? Mhz), ", period);
3674 } else { 3674 } else {
3675 seq_printf(m, 3675 seq_printf(m,
3676 "%d (%d.%d Mhz),", 3676 "%d (%d.%d Mhz),",
@@ -3711,17 +3711,17 @@ static void asc_prt_board_stats(struct seq_file *m, struct Scsi_Host *shost)
3711 shost->host_no); 3711 shost->host_no);
3712 3712
3713 seq_printf(m, 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 s->queuecommand, s->reset, s->biosparam, 3715 s->queuecommand, s->reset, s->biosparam,
3716 s->interrupt); 3716 s->interrupt);
3717 3717
3718 seq_printf(m, 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 s->callback, s->done, s->build_error, 3720 s->callback, s->done, s->build_error,
3721 s->adv_build_noreq, s->adv_build_nosg); 3721 s->adv_build_noreq, s->adv_build_nosg);
3722 3722
3723 seq_printf(m, 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 s->exe_noerror, s->exe_busy, s->exe_error, 3725 s->exe_noerror, s->exe_busy, s->exe_error,
3726 s->exe_unknown); 3726 s->exe_unknown);
3727 3727
@@ -3729,22 +3729,22 @@ static void asc_prt_board_stats(struct seq_file *m, struct Scsi_Host *shost)
3729 * Display data transfer statistics. 3729 * Display data transfer statistics.
3730 */ 3730 */
3731 if (s->xfer_cnt > 0) { 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 s->xfer_cnt, s->xfer_elem); 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 s->xfer_sect / 2, ASC_TENTHS(s->xfer_sect, 2)); 3736 s->xfer_sect / 2, ASC_TENTHS(s->xfer_sect, 2));
3737 3737
3738 /* Scatter gather transfer statistics */ 3738 /* Scatter gather transfer statistics */
3739 seq_printf(m, " avg_num_elem %lu.%01lu, ", 3739 seq_printf(m, " avg_num_elem %u.%01u, ",
3740 s->xfer_elem / s->xfer_cnt, 3740 s->xfer_elem / s->xfer_cnt,
3741 ASC_TENTHS(s->xfer_elem, s->xfer_cnt)); 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 (s->xfer_sect / 2) / s->xfer_elem, 3744 (s->xfer_sect / 2) / s->xfer_elem,
3745 ASC_TENTHS((s->xfer_sect / 2), s->xfer_elem)); 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 (s->xfer_sect / 2) / s->xfer_cnt, 3748 (s->xfer_sect / 2) / s->xfer_cnt,
3749 ASC_TENTHS((s->xfer_sect / 2), s->xfer_cnt)); 3749 ASC_TENTHS((s->xfer_sect / 2), s->xfer_cnt));
3750 } 3750 }