hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stephen Rothwell 2009-01-13 20:04:48 +00:00 committed by Benjamin Herrenschmidt
parent 5c949070c7
commit e377c6e24d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/block/ps3disk.c
View File

@ -141,7 +141,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
start_sector = req->sector * priv->blocking_factor; start_sector = req->sector * priv->blocking_factor;
sectors = req->nr_sectors * priv->blocking_factor; sectors = req->nr_sectors * priv->blocking_factor;
dev_dbg(&dev->sbd.core, "%s:%u: %s %lu sectors starting at %lu\n", dev_dbg(&dev->sbd.core, "%s:%u: %s %llu sectors starting at %llu\n",
__func__, __LINE__, op, sectors, start_sector); __func__, __LINE__, op, sectors, start_sector);
if (write) { if (write) {
@ -178,7 +178,7 @@ static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0,
0, &dev->tag); 0, &dev->tag);
if (res) { if (res) {
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%lx\n", dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
__func__, __LINE__, res); __func__, __LINE__, res);
end_request(req, 0); end_request(req, 0);
return 0; return 0;
@ -238,11 +238,11 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
if (tag != dev->tag) if (tag != dev->tag)
dev_err(&dev->sbd.core, dev_err(&dev->sbd.core,
"%s:%u: tag mismatch, got %lx, expected %lx\n", "%s:%u: tag mismatch, got %llx, expected %llx\n",
__func__, __LINE__, tag, dev->tag); __func__, __LINE__, tag, dev->tag);
if (res) { if (res) {
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n", dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n",
__func__, __LINE__, res, status); __func__, __LINE__, res, status);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -269,7 +269,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
op = read ? "read" : "write"; op = read ? "read" : "write";
} }
if (status) { if (status) {
dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__, dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%llx\n", __func__,
__LINE__, op, status); __LINE__, op, status);
error = -EIO; error = -EIO;
} else { } else {
@ -297,7 +297,7 @@ static int ps3disk_sync_cache(struct ps3_storage_device *dev)
res = ps3stor_send_command(dev, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 0); res = ps3stor_send_command(dev, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 0);
if (res) { if (res) {
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%lx\n", dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
__func__, __LINE__, res); __func__, __LINE__, res);
return -EIO; return -EIO;
} }
@ -388,7 +388,7 @@ static int ps3disk_identify(struct ps3_storage_device *dev)
sizeof(ata_cmnd), ata_cmnd.buffer, sizeof(ata_cmnd), ata_cmnd.buffer,
ata_cmnd.arglen); ata_cmnd.arglen);
if (res) { if (res) {
dev_err(&dev->sbd.core, "%s:%u: identify disk failed 0x%lx\n", dev_err(&dev->sbd.core, "%s:%u: identify disk failed 0x%llx\n",
__func__, __LINE__, res); __func__, __LINE__, res);
return -EIO; return -EIO;
} }
@ -426,7 +426,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
if (dev->blk_size < 512) { if (dev->blk_size < 512) {
dev_err(&dev->sbd.core, dev_err(&dev->sbd.core,
"%s:%u: cannot handle block size %lu\n", __func__, "%s:%u: cannot handle block size %llu\n", __func__,
__LINE__, dev->blk_size); __LINE__, dev->blk_size);
return -EINVAL; return -EINVAL;
} }
@ -512,7 +512,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
dev->regions[dev->region_idx].size*priv->blocking_factor); dev->regions[dev->region_idx].size*priv->blocking_factor);
dev_info(&dev->sbd.core, dev_info(&dev->sbd.core,
"%s is a %s (%lu MiB total, %lu MiB for OtherOS)\n", "%s is a %s (%llu MiB total, %lu MiB for OtherOS)\n",
gendisk->disk_name, priv->model, priv->raw_capacity >> 11, gendisk->disk_name, priv->model, priv->raw_capacity >> 11,
get_capacity(gendisk) >> 11); get_capacity(gendisk) >> 11);