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

powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Stephen Rothwell and committed by
Benjamin Herrenschmidt e377c6e2 5c949070

+9 -9
+9 -9
drivers/block/ps3disk.c
··· 141 141 142 142 start_sector = req->sector * priv->blocking_factor; 143 143 sectors = req->nr_sectors * priv->blocking_factor; 144 - dev_dbg(&dev->sbd.core, "%s:%u: %s %lu sectors starting at %lu\n", 144 + dev_dbg(&dev->sbd.core, "%s:%u: %s %llu sectors starting at %llu\n", 145 145 __func__, __LINE__, op, sectors, start_sector); 146 146 147 147 if (write) { ··· 178 178 LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 179 179 0, &dev->tag); 180 180 if (res) { 181 - dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%lx\n", 181 + dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n", 182 182 __func__, __LINE__, res); 183 183 end_request(req, 0); 184 184 return 0; ··· 238 238 239 239 if (tag != dev->tag) 240 240 dev_err(&dev->sbd.core, 241 - "%s:%u: tag mismatch, got %lx, expected %lx\n", 241 + "%s:%u: tag mismatch, got %llx, expected %llx\n", 242 242 __func__, __LINE__, tag, dev->tag); 243 243 244 244 if (res) { 245 - dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n", 245 + dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n", 246 246 __func__, __LINE__, res, status); 247 247 return IRQ_HANDLED; 248 248 } ··· 269 269 op = read ? "read" : "write"; 270 270 } 271 271 if (status) { 272 - dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__, 272 + dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%llx\n", __func__, 273 273 __LINE__, op, status); 274 274 error = -EIO; 275 275 } else { ··· 297 297 298 298 res = ps3stor_send_command(dev, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 0); 299 299 if (res) { 300 - dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%lx\n", 300 + dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n", 301 301 __func__, __LINE__, res); 302 302 return -EIO; 303 303 } ··· 388 388 sizeof(ata_cmnd), ata_cmnd.buffer, 389 389 ata_cmnd.arglen); 390 390 if (res) { 391 - dev_err(&dev->sbd.core, "%s:%u: identify disk failed 0x%lx\n", 391 + dev_err(&dev->sbd.core, "%s:%u: identify disk failed 0x%llx\n", 392 392 __func__, __LINE__, res); 393 393 return -EIO; 394 394 } ··· 426 426 427 427 if (dev->blk_size < 512) { 428 428 dev_err(&dev->sbd.core, 429 - "%s:%u: cannot handle block size %lu\n", __func__, 429 + "%s:%u: cannot handle block size %llu\n", __func__, 430 430 __LINE__, dev->blk_size); 431 431 return -EINVAL; 432 432 } ··· 512 512 dev->regions[dev->region_idx].size*priv->blocking_factor); 513 513 514 514 dev_info(&dev->sbd.core, 515 - "%s is a %s (%lu MiB total, %lu MiB for OtherOS)\n", 515 + "%s is a %s (%llu MiB total, %lu MiB for OtherOS)\n", 516 516 gendisk->disk_name, priv->model, priv->raw_capacity >> 11, 517 517 get_capacity(gendisk) >> 11); 518 518