Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemo...

[linux-2.6-omap-h63xx.git] / drivers / scsi / ps3rom.c

diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c
index b50f1e14f2a5618dab46e1a600a43d85fdc02ab3..0cd614a0fa73d98eb354aee000c1c4f1909de050 100644 (file)
--- a/drivers/scsi/ps3rom.c
+++ b/drivers/scsi/ps3rom.c
@@ -35,7 +35,7 @@
 
 #define BOUNCE_SIZE                    (64*1024)
 
-#define PS3ROM_MAX_SECTORS             (BOUNCE_SIZE / CD_FRAMESIZE)
+#define PS3ROM_MAX_SECTORS             (BOUNCE_SIZE >> 9)
 
 
 struct ps3rom_private {
@@ -100,31 +100,31 @@ static int fill_from_dev_buffer(struct scsi_cmnd *cmd, const void *buf)
        struct scatterlist *sgpnt;
        unsigned int buflen;
 
-       buflen = cmd->request_bufflen;
+       buflen = scsi_bufflen(cmd);
        if (!buflen)
                return 0;
 
-       if (!cmd->request_buffer)
+       if (!scsi_sglist(cmd))
                return -1;
 
-       sgpnt = cmd->request_buffer;
        active = 1;
-       for (k = 0, req_len = 0, act_len = 0; k < cmd->use_sg; ++k, ++sgpnt) {
+       req_len = act_len = 0;
+       scsi_for_each_sg(cmd, sgpnt, scsi_sg_count(cmd), k) {
                if (active) {
-                       kaddr = kmap_atomic(sgpnt->page, KM_IRQ0);
+                       kaddr = kmap_atomic(sg_page(sgpnt), KM_IRQ0);
                        len = sgpnt->length;
                        if ((req_len + len) > buflen) {
                                active = 0;
                                len = buflen - req_len;
                        }
                        memcpy(kaddr + sgpnt->offset, buf + req_len, len);
-                       flush_kernel_dcache_page(sgpnt->page);
+                       flush_kernel_dcache_page(sg_page(sgpnt));
                        kunmap_atomic(kaddr, KM_IRQ0);
                        act_len += len;
                }
                req_len += sgpnt->length;
        }
-       cmd->resid = req_len - act_len;
+       scsi_set_resid(cmd, req_len - act_len);
        return 0;
 }
 
@@ -138,16 +138,16 @@ static int fetch_to_dev_buffer(struct scsi_cmnd *cmd, void *buf)
        struct scatterlist *sgpnt;
        unsigned int buflen;
 
-       buflen = cmd->request_bufflen;
+       buflen = scsi_bufflen(cmd);
        if (!buflen)
                return 0;
 
-       if (!cmd->request_buffer)
+       if (!scsi_sglist(cmd))
                return -1;
 
-       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);
+       req_len = fin = 0;
+       scsi_for_each_sg(cmd, sgpnt, scsi_sg_count(cmd), k) {
+               kaddr = kmap_atomic(sg_page(sgpnt), KM_IRQ0);
                len = sgpnt->length;
                if ((req_len + len) > buflen) {
                        len = buflen - req_len;
@@ -177,12 +177,12 @@ static int ps3rom_atapi_request(struct ps3_storage_device *dev,
        memcpy(&atapi_cmnd.pkt, cmd->cmnd, 12);
        atapi_cmnd.pktlen = 12;
        atapi_cmnd.block_size = 1; /* transfer size is block_size * blocks */
-       atapi_cmnd.blocks = atapi_cmnd.arglen = cmd->request_bufflen;
+       atapi_cmnd.blocks = atapi_cmnd.arglen = scsi_bufflen(cmd);
        atapi_cmnd.buffer = dev->bounce_lpar;
 
        switch (cmd->sc_data_direction) {
        case DMA_FROM_DEVICE:
-               if (cmd->request_bufflen >= CD_FRAMESIZE)
+               if (scsi_bufflen(cmd) >= CD_FRAMESIZE)
                        atapi_cmnd.proto = DMA_PROTO;
                else
                        atapi_cmnd.proto = PIO_DATA_IN_PROTO;
@@ -190,7 +190,7 @@ static int ps3rom_atapi_request(struct ps3_storage_device *dev,
                break;
 
        case DMA_TO_DEVICE:
-               if (cmd->request_bufflen >= CD_FRAMESIZE)
+               if (scsi_bufflen(cmd) >= CD_FRAMESIZE)
                        atapi_cmnd.proto = DMA_PROTO;
                else
                        atapi_cmnd.proto = PIO_DATA_OUT_PROTO;