diff options
| -rw-r--r-- | drivers/block/ps3disk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index 936466f62afd..bccc42bb9212 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c | |||
| @@ -141,7 +141,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev, | |||
| 141 | 141 | ||
| 142 | start_sector = req->sector * priv->blocking_factor; | 142 | start_sector = req->sector * priv->blocking_factor; |
| 143 | sectors = req->nr_sectors * priv->blocking_factor; | 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 | __func__, __LINE__, op, sectors, start_sector); | 145 | __func__, __LINE__, op, sectors, start_sector); |
| 146 | 146 | ||
| 147 | if (write) { | 147 | if (write) { |
| @@ -178,7 +178,7 @@ static int ps3disk_submit_flush_request(struct ps3_storage_device *dev, | |||
| 178 | LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, | 178 | LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, |
| 179 | 0, &dev->tag); | 179 | 0, &dev->tag); |
| 180 | if (res) { | 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 | __func__, __LINE__, res); | 182 | __func__, __LINE__, res); |
| 183 | end_request(req, 0); | 183 | end_request(req, 0); |
| 184 | return 0; | 184 | return 0; |
| @@ -238,11 +238,11 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data) | |||
| 238 | 238 | ||
| 239 | if (tag != dev->tag) | 239 | if (tag != dev->tag) |
| 240 | dev_err(&dev->sbd.core, | 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 | __func__, __LINE__, tag, dev->tag); | 242 | __func__, __LINE__, tag, dev->tag); |
| 243 | 243 | ||
| 244 | if (res) { | 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 | __func__, __LINE__, res, status); | 246 | __func__, __LINE__, res, status); |
| 247 | return IRQ_HANDLED; | 247 | return IRQ_HANDLED; |
| 248 | } | 248 | } |
| @@ -269,7 +269,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data) | |||
| 269 | op = read ? "read" : "write"; | 269 | op = read ? "read" : "write"; |
| 270 | } | 270 | } |
| 271 | if (status) { | 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 | __LINE__, op, status); | 273 | __LINE__, op, status); |
| 274 | error = -EIO; | 274 | error = -EIO; |
| 275 | } else { | 275 | } else { |
| @@ -297,7 +297,7 @@ static int ps3disk_sync_cache(struct ps3_storage_device *dev) | |||
| 297 | 297 | ||
| 298 | res = ps3stor_send_command(dev, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 0); | 298 | res = ps3stor_send_command(dev, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 0); |
| 299 | if (res) { | 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 | __func__, __LINE__, res); | 301 | __func__, __LINE__, res); |
| 302 | return -EIO; | 302 | return -EIO; |
| 303 | } | 303 | } |
| @@ -388,7 +388,7 @@ static int ps3disk_identify(struct ps3_storage_device *dev) | |||
| 388 | sizeof(ata_cmnd), ata_cmnd.buffer, | 388 | sizeof(ata_cmnd), ata_cmnd.buffer, |
| 389 | ata_cmnd.arglen); | 389 | ata_cmnd.arglen); |
| 390 | if (res) { | 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 | __func__, __LINE__, res); | 392 | __func__, __LINE__, res); |
| 393 | return -EIO; | 393 | return -EIO; |
| 394 | } | 394 | } |
| @@ -426,7 +426,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) | |||
| 426 | 426 | ||
| 427 | if (dev->blk_size < 512) { | 427 | if (dev->blk_size < 512) { |
| 428 | dev_err(&dev->sbd.core, | 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 | __LINE__, dev->blk_size); | 430 | __LINE__, dev->blk_size); |
| 431 | return -EINVAL; | 431 | return -EINVAL; |
| 432 | } | 432 | } |
| @@ -512,7 +512,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) | |||
| 512 | dev->regions[dev->region_idx].size*priv->blocking_factor); | 512 | dev->regions[dev->region_idx].size*priv->blocking_factor); |
| 513 | 513 | ||
| 514 | dev_info(&dev->sbd.core, | 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 | gendisk->disk_name, priv->model, priv->raw_capacity >> 11, | 516 | gendisk->disk_name, priv->model, priv->raw_capacity >> 11, |
| 517 | get_capacity(gendisk) >> 11); | 517 | get_capacity(gendisk) >> 11); |
| 518 | 518 | ||
