From patchwork Fri Mar 4 10:27:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 323 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:41:41 -0000 Delivered-To: patches@linaro.org Received: by 10.224.60.68 with SMTP id o4cs9921qah; Fri, 4 Mar 2011 02:27:25 -0800 (PST) Received: by 10.229.43.2 with SMTP id u2mr289734qce.215.1299234445132; Fri, 04 Mar 2011 02:27:25 -0800 (PST) Received: from mail-qw0-f50.google.com (mail-qw0-f50.google.com [209.85.216.50]) by mx.google.com with ESMTPS id m14si4123960qcu.110.2011.03.04.02.27.25 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Mar 2011 02:27:25 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.50 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.216.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.216.50 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) smtp.mail=linus.walleij@linaro.org Received: by mail-qw0-f50.google.com with SMTP id 3so1842112qwk.37 for ; Fri, 04 Mar 2011 02:27:25 -0800 (PST) MIME-Version: 1.0 Received: by 10.224.199.2 with SMTP id eq2mr380991qab.34.1299234445036; Fri, 04 Mar 2011 02:27:25 -0800 (PST) Received: by 10.224.28.201 with HTTP; Fri, 4 Mar 2011 02:27:25 -0800 (PST) In-Reply-To: <1297350656-3392-1-git-send-email-linus.walleij@linaro.org> References: <1297350656-3392-1-git-send-email-linus.walleij@linaro.org> Date: Fri, 4 Mar 2011 11:27:25 +0100 Message-ID: Subject: Fwd: [PATCH 10/11] tmio_mmc: drop dma_sglen state variable From: Linus Walleij To: Patch Tracking ---------- Forwarded message ---------- From: Linus Walleij Date: Thu, Feb 10, 2011 at 4:10 PM Subject: [PATCH 10/11] tmio_mmc: drop dma_sglen state variable To: linux-mmc@vger.kernel.org, Chris Ball Cc: Dan Williams , Ian Molton , Linus Walleij This variable doesn't seem to be used for anything after the other patches so just drop it. Signed-off-by: Linus Walleij ---  drivers/mmc/host/tmio_mmc.c |    9 ++-------  1 files changed, 2 insertions(+), 7 deletions(-)  #endif @@ -826,11 +825,9 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)        }        ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE); -       if (ret > 0) { -               host->dma_sglen = ret; +       if (ret > 0)                desc = chan->device->device_prep_slave_sg(chan, sg, ret,                        DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); -       }        if (desc) {                desc->callback = tmio_dma_complete; @@ -907,11 +904,9 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)        }        ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE); -       if (ret > 0) { -               host->dma_sglen = ret; +       if (ret > 0)                desc = chan->device->device_prep_slave_sg(chan, sg, ret,                        DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); -       }        if (desc) {                desc->callback = tmio_dma_complete; -- 1.7.4 diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index 5da2e17..708b3a1 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -152,7 +152,6 @@ struct tmio_mmc_host {        struct tasklet_struct   dma_complete;        struct tasklet_struct   dma_issue;  #ifdef CONFIG_TMIO_MMC_DMA -       unsigned int            dma_sglen;        u8                      bounce_buf[PAGE_CACHE_SIZE] __attribute__((aligned(MAX_ALIGN)));        struct scatterlist      bounce_sg;