diff options
author | Michael Richardson <mcr@sandelman.ottawa.on.ca> | 2006-02-07 15:58:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:12:31 -0500 |
commit | c2f8311d3168ed7d391ba5df5b80f4af0a3457d0 (patch) | |
tree | 08d9638a748da146d3d91cce2a64555aa9670282 /drivers/ide/ide-disk.c | |
parent | cbd0d51a3318583fabf03bccc7a987e158482361 (diff) |
[PATCH] ide: cast arguments to pr_debug() properly
This does not show up unless you #define DEBUG in the file, which most
people wouldn't do. On PPC405, at least, "sector_t" is unsigned long,
which doesn't match %llx/%llu. Since sector# may well be >32 bits, promote
the value to match the format.
Signed-off-by: Michael Richardson <mcr@xelerance.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r-- | drivers/ide/ide-disk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 6c60a9d2afd8..09086b8b6486 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -190,7 +190,8 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, | |||
190 | if (lba48) { | 190 | if (lba48) { |
191 | task_ioreg_t tasklets[10]; | 191 | task_ioreg_t tasklets[10]; |
192 | 192 | ||
193 | pr_debug("%s: LBA=0x%012llx\n", drive->name, block); | 193 | pr_debug("%s: LBA=0x%012llx\n", drive->name, |
194 | (unsigned long long)block); | ||
194 | 195 | ||
195 | tasklets[0] = 0; | 196 | tasklets[0] = 0; |
196 | tasklets[1] = 0; | 197 | tasklets[1] = 0; |
@@ -317,7 +318,8 @@ static ide_startstop_t ide_do_rw_disk (ide_drive_t *drive, struct request *rq, s | |||
317 | 318 | ||
318 | pr_debug("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n", | 319 | pr_debug("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n", |
319 | drive->name, rq_data_dir(rq) == READ ? "read" : "writ", | 320 | drive->name, rq_data_dir(rq) == READ ? "read" : "writ", |
320 | block, rq->nr_sectors, (unsigned long)rq->buffer); | 321 | (unsigned long long)block, rq->nr_sectors, |
322 | (unsigned long)rq->buffer); | ||
321 | 323 | ||
322 | if (hwif->rw_disk) | 324 | if (hwif->rw_disk) |
323 | hwif->rw_disk(drive, rq); | 325 | hwif->rw_disk(drive, rq); |