The patch titled
ps3rom: updates after final review
has been added to the -mm tree. Its filename is
ps3-bd-dvd-cd-rom-storage-driver-updates-after-final-review.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ps3rom: updates after final review
From: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
ps3rom: updates after final review:
o Kill confusing ps3rom_priv() macro, open code it instead
o kmap_atomic() cannot fail
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Cc: Geoff Levand <geoffrey.levand@xxxxxxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/ps3rom.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff -puN drivers/scsi/ps3rom.c~ps3-bd-dvd-cd-rom-storage-driver-updates-after-final-review drivers/scsi/ps3rom.c
--- a/drivers/scsi/ps3rom.c~ps3-bd-dvd-cd-rom-storage-driver-updates-after-final-review
+++ a/drivers/scsi/ps3rom.c
@@ -42,7 +42,6 @@ struct ps3rom_private {
struct ps3_storage_device *dev;
struct scsi_cmnd *curr_cmd;
};
-#define ps3rom_priv(dev) ((dev)->sbd.core.driver_data)
#define LV1_STORAGE_SEND_ATAPI_COMMAND (1)
@@ -113,8 +112,6 @@ static int fill_from_dev_buffer(struct s
for (k = 0, req_len = 0, act_len = 0; k < cmd->use_sg; ++k, ++sgpnt) {
if (active) {
kaddr = kmap_atomic(sgpnt->page, KM_IRQ0);
- if (!kaddr)
- return -1;
len = sgpnt->length;
if ((req_len + len) > buflen) {
active = 0;
@@ -151,8 +148,6 @@ static int fetch_to_dev_buffer(struct sc
sgpnt = cmd->request_buffer;
for (k = 0, req_len = 0, fin = 0; k < cmd->use_sg; ++k, ++sgpnt) {
kaddr = kmap_atomic(sgpnt->page, KM_IRQ0);
- if (!kaddr)
- return -1;
len = sgpnt->length;
if ((req_len + len) > buflen) {
len = buflen - req_len;
@@ -379,7 +374,7 @@ static irqreturn_t ps3rom_interrupt(int
return IRQ_HANDLED;
}
- host = ps3rom_priv(dev);
+ host = dev->sbd.core.driver_data;
priv = shost_priv(host);
cmd = priv->curr_cmd;
@@ -469,7 +464,7 @@ static int __devinit ps3rom_probe(struct
}
priv = shost_priv(host);
- ps3rom_priv(dev) = host;
+ dev->sbd.core.driver_data = host;
priv->dev = dev;
/* One device/LUN per SCSI bus */
@@ -489,7 +484,7 @@ static int __devinit ps3rom_probe(struct
fail_host_put:
scsi_host_put(host);
- ps3rom_priv(dev) = NULL;
+ dev->sbd.core.driver_data = NULL;
fail_teardown:
ps3stor_teardown(dev);
fail_free_bounce:
@@ -500,12 +495,12 @@ fail_free_bounce:
static int ps3rom_remove(struct ps3_system_bus_device *_dev)
{
struct ps3_storage_device *dev = to_ps3_storage_device(&_dev->core);
- struct Scsi_Host *host = ps3rom_priv(dev);
+ struct Scsi_Host *host = dev->sbd.core.driver_data;
scsi_remove_host(host);
ps3stor_teardown(dev);
scsi_host_put(host);
- ps3rom_priv(dev) = NULL;
+ dev->sbd.core.driver_data = NULL;
kfree(dev->bounce_buf);
return 0;
}
_
Patches currently in -mm which might be from Geert.Uytterhoeven@xxxxxxxxxxx are
origin.patch
ps3-disk-storage-driver.patch
ps3-disk-storage-driver-use-correct-bio-vector-size.patch
ps3-disk-storage-driver-updates-after-final-review.patch
ps3-bd-dvd-cd-rom-storage-driver.patch
ps3-bd-dvd-cd-rom-storage-driver-updates-after-final-review.patch
ps3-flash-rom-storage-driver.patch
ps3-flash-rom-storage-driver-updates-after-final-review.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
