From patchwork Sun Aug 20 21:39:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9911449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F8AE601D4 for ; Sun, 20 Aug 2017 21:39:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 439AF2867E for ; Sun, 20 Aug 2017 21:39:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36443286CB; Sun, 20 Aug 2017 21:39:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 372082867E for ; Sun, 20 Aug 2017 21:39:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341AbdHTVjY (ORCPT ); Sun, 20 Aug 2017 17:39:24 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:36365 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753300AbdHTVjX (ORCPT ); Sun, 20 Aug 2017 17:39:23 -0400 Received: by mail-lf0-f41.google.com with SMTP id f123so10435851lfe.3 for ; Sun, 20 Aug 2017 14:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F23afzBnA/K1nNlQkhyT/X/HjdTcXv5wB1TABpphU3I=; b=CtlpctRoF0uN3lK6BS5sV/xdt7OgS280Yxgzv05IcaSU6cN17ruajowneUetsw4jdv 8u3sW2I0MU4wumS00equyqQxfYZx8avIa7DJo/EcBuzxiWPrnIiwmvgP7vdUgpnkfEBK 88tyPMINshulA0Mv8jx8u1ZuX9t+3rwwlIL4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F23afzBnA/K1nNlQkhyT/X/HjdTcXv5wB1TABpphU3I=; b=tcK1FrTqJQaG5kUQNQwS1Dyy4FzSlpHCCRb2dbVlSWYMFkzf1ChgqOVHL7ZWfnQsid TVnM7o57EF/Jrd9ysBIdHRJKFCkgGCcLok/TiquN3gBmKUpl/+YJmpqiHLnTwKZRg7uH 5bRUyPyeZpi1H3B+3dd64J06oYOD0pdjt8HRMHYGs3djXTtxgCOSteBLSQmlZR5TD7Fz WyHEYxqpGMiPhORDhWqfRobY2lDq8b28GvuRjAfOmnLp6wMJGCnp0hYcLQ+3P/J7ZyGm 5ZlX/AQL9SD9+2P4yG4vmL+zm3aSzS0nnXiuUpNQadl4VFAfFPW2bA8ovcEoyy+EJhTD HeqQ== X-Gm-Message-State: AHYfb5gUNpzc638PWxBLoQvxOpOb3op54ILpMM+tvKj+5oxHXMP7NYWC Y1DP7hRjPi+OkdEym8kIXg== X-Received: by 10.25.199.147 with SMTP id x141mr424817lff.124.1503265162332; Sun, 20 Aug 2017 14:39:22 -0700 (PDT) Received: from genomnajs.bredbandsbolaget.se (c-097b71d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.123.9]) by smtp.gmail.com with ESMTPSA id f136sm2381830lff.34.2017.08.20.14.39.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Aug 2017 14:39:21 -0700 (PDT) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij Subject: [PATCH 1/8 v5] mmc: block: Anonymize the drv op data pointer Date: Sun, 20 Aug 2017 23:39:06 +0200 Message-Id: <20170820213913.9737-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170820213913.9737-1-linus.walleij@linaro.org> References: <20170820213913.9737-1-linus.walleij@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have a data pointer for the ioctl() data, but we need to pass other data along with the DRV_OP:s, so make this a void * so it can be reused. Signed-off-by: Linus Walleij --- ChangeLog v3->v5: - No changes just resending ChangeLog v3->v4: - No changes just resending ChangeLog v2->v3: - No changes just resending --- drivers/mmc/core/block.c | 8 +++++--- drivers/mmc/core/queue.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 91e1e93f40e3..30b8b979ea62 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -596,7 +596,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, __GFP_RECLAIM); idatas[0] = idata; req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_IOCTL; - req_to_mmc_queue_req(req)->idata = idatas; + req_to_mmc_queue_req(req)->drv_op_data = idatas; req_to_mmc_queue_req(req)->ioc_count = 1; blk_execute_rq(mq->queue, NULL, req, 0); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; @@ -675,7 +675,7 @@ static int mmc_blk_ioctl_multi_cmd(struct block_device *bdev, idata[0]->ic.write_flag ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, __GFP_RECLAIM); req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_IOCTL; - req_to_mmc_queue_req(req)->idata = idata; + req_to_mmc_queue_req(req)->drv_op_data = idata; req_to_mmc_queue_req(req)->ioc_count = num_of_cmds; blk_execute_rq(mq->queue, NULL, req, 0); ioc_err = req_to_mmc_queue_req(req)->drv_op_result; @@ -1176,6 +1176,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) struct mmc_queue_req *mq_rq; struct mmc_card *card = mq->card; struct mmc_blk_data *md = mq->blkdata; + struct mmc_blk_ioc_data **idata; int ret; int i; @@ -1183,8 +1184,9 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) switch (mq_rq->drv_op) { case MMC_DRV_OP_IOCTL: + idata = mq_rq->drv_op_data; for (i = 0, ret = 0; i < mq_rq->ioc_count; i++) { - ret = __mmc_blk_ioctl_cmd(card, md, mq_rq->idata[i]); + ret = __mmc_blk_ioctl_cmd(card, md, idata[i]); if (ret) break; } diff --git a/drivers/mmc/core/queue.h b/drivers/mmc/core/queue.h index 361b46408e0f..cf26a15a64bf 100644 --- a/drivers/mmc/core/queue.h +++ b/drivers/mmc/core/queue.h @@ -51,7 +51,7 @@ struct mmc_queue_req { struct mmc_async_req areq; enum mmc_drv_op drv_op; int drv_op_result; - struct mmc_blk_ioc_data **idata; + void *drv_op_data; unsigned int ioc_count; };