Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=213d7bbd76673fb1b26f1786af180bac07e57652
Commit:     213d7bbd76673fb1b26f1786af180bac07e57652
Parent:     36abb3b18e26bf980e8529512853c5d73971a48b
Author:     Kristian Høgsberg <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 19:23:11 2007 -0400
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Thu May 10 18:24:14 2007 +0200

    firewire: Drop single buffer request support.
    
    The SCSI layer only passes sg requests down, so drop the
    use_sg == 0, request_bufflen != 0 case.
    
    Signed-off-by: Kristian Hoegsberg <[EMAIL PROTECTED]>
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/firewire/fw-sbp2.c |   43 +------------------------------------------
 1 files changed, 1 insertions(+), 42 deletions(-)

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index cb808d5..e2ffbc8 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -976,34 +976,6 @@ static int sbp2_command_orb_map_scatterlist(struct 
sbp2_command_orb *orb)
        return -ENOMEM;
 }
 
-static int sbp2_command_orb_map_buffer(struct sbp2_command_orb *orb)
-{
-       struct sbp2_device *sd =
-               (struct sbp2_device *)orb->cmd->device->host->hostdata;
-       struct fw_unit *unit = sd->unit;
-       struct fw_device *device = fw_device(unit->device.parent);
-
-       /*
-        * As for map_scatterlist, we need to fill in the high bits of
-        * the data_descriptor pointer.
-        */
-
-       orb->request_buffer_bus =
-               dma_map_single(device->card->device,
-                              orb->cmd->request_buffer,
-                              orb->cmd->request_bufflen,
-                              orb->cmd->sc_data_direction);
-       if (dma_mapping_error(orb->request_buffer_bus))
-               return -ENOMEM;
-
-       orb->request.data_descriptor.high = sd->address_high;
-       orb->request.data_descriptor.low  = orb->request_buffer_bus;
-       orb->request.misc |=
-               COMMAND_ORB_DATA_SIZE(orb->cmd->request_bufflen);
-
-       return 0;
-}
-
 /* SCSI stack integration */
 
 static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
@@ -1063,21 +1035,8 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, 
scsi_done_fn_t done)
                orb->request.misc |=
                        COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA);
 
-       if (cmd->use_sg) {
-               if (sbp2_command_orb_map_scatterlist(orb) < 0)
-                       goto fail_map_payload;
-       } else if (cmd->request_bufflen > SBP2_MAX_SG_ELEMENT_LENGTH) {
-               /*
-                * FIXME: Need to split this into a sg list... but
-                * could we get the scsi or blk layer to do that by
-                * reporting our max supported block size?
-                */
-               fw_error("command > 64k\n");
+       if (cmd->use_sg && sbp2_command_orb_map_scatterlist(orb) < 0)
                goto fail_map_payload;
-       } else if (cmd->request_bufflen > 0) {
-               if (sbp2_command_orb_map_buffer(orb) < 0)
-                       goto fail_map_payload;
-       }
 
        fw_memcpy_to_be32(&orb->request, &orb->request, sizeof orb->request);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to