From patchwork Wed Mar 6 14:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159747 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6205959jad; Wed, 6 Mar 2019 06:05:02 -0800 (PST) X-Received: by 2002:a2e:9d85:: with SMTP id c5mr2752525ljj.70.1551881102079; Wed, 06 Mar 2019 06:05:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881102; cv=none; d=google.com; s=arc-20160816; b=wXVhnVS+FeiE2v5QLGGi1wqQMKcA9BKtK8AAFetAv5MkbFOZWccILAc1zDtVfZWM16 Pl+mYEvMj6+fOHg0s90M9CVGeUtV279yePpckpjS76kuqrRlMCL5OrQdMZ32YnrTHsD1 ZM1S3TLEP2ENN9ld+ODRSenjYs1RvBjEjNWhByxAy6YbWCpGpR2yKT4Ve3eH16th8kdu cTb7iXoYWJQoZ+TQF8uvu7RdpN7QBLWu3wZjs32wbYY6wD1L6kI2+LUalijCFSNesgBa AXTw8hKHYOkJBuy0eIaX8MdwE7fBC2vUuR9HcitD6dsGl6WFOCJ2yh0HMX6tlqthrcOF elSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=g/Za4hq141wjla95OKLl48Gc6w1ISNKdaaNlUk5ERmI=; b=uq3YgKYMWcXokmNrdqjLTA/lgTNpeSlDtjaVbpBGZCeXG8b84YEpDZqPrb2ZW+iVgw RmLwT8Q885KewGLTdCZ/E4OlD11R1KxTRUx2LNEEprqedgxAVK4Z9H8mJB+/DdLgPhEa TDv1KHtkRIHyXXPZdg9E/DDsZRygUyPyLp3aFGY7j7LMqAcf9sUwgMW7rL5dlYYgFyiT jedy5OvtscMv8QyfNIwq5ObnnQcFNOg+zA05qeCFh0UklyUL98QTUv0rLSk8EEFXdxED WbGqOg2nmIjvS7haNFRPwT70vHf7SVmzMm6CPqArkBfHBRQ5nyXKXmJeB6wkgWV4OVRC Jb0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PPlYImpw; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p12sor552626lfk.37.2019.03.06.06.05.01 for (Google Transport Security); Wed, 06 Mar 2019 06:05:01 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PPlYImpw; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=g/Za4hq141wjla95OKLl48Gc6w1ISNKdaaNlUk5ERmI=; b=PPlYImpw3uCGHuRsgpCi4OCVgzRykzOR8PtmsyTRQbC5+1iABqBR7zRsDePBKpJ2hb Zt3VdsBLZnsF8u8SzOraAP0E3I0qKUpdSUIF+dml72nDWt2u6FvruCLdOsfEqn0F77cD +heGv6KNiYsFfvxenmRo3f9KPFayV0tQKeLq8ZiAmic4r/KY6J6B/3z9wycdl+xc/VXz kBnOiglKkHovx6MdCk3eAiZzpwxL0Hz4G7DxwrMQ30UGVtCqQJsmNztUJZdqb5sTiJxL KX+VamQL6gPf1eR+My7kPfH6f6zz7RCZrScUpnmIIglaxlhduyhgueBOBg96yortr5UR /pNg== 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=g/Za4hq141wjla95OKLl48Gc6w1ISNKdaaNlUk5ERmI=; b=VFuit+l3AM/Vz9gc6YIxqiOylEiOhTaxqDrhfJfpTz2xBLB6rPepdnHHQcf3spCEob dQEmlSiD5EujC+IOvXxL0kntqebc0ghltsMH90HKfdPwanJvdGjAb4tdgP380sir4IMY wbFG1d1yhBRrQ4skzlM1dmeSoP65v+c/ida5ygJUp//6seZjO++9HU/g4hgFhZv2hvAU /5hfU45pFChSBaql8pU2cLSJO3+SC0pdHLi2F/VBqWfRS1ZRFfZoZUfytMFVhl3KpgAa 91Itqt2q66mRPtjkSCjr11NCWcpkop+92Atrnj5Gbwpyug9c4QpT11BLGCsC/w6VWrqi ubfQ== X-Gm-Message-State: APjAAAXBMK0lTBLk3mesCBV8YKddi02+XCC1qOqsisFV56P5N77G3ay/ 4zCstaAq0NovDKXT+7px4iYqE3Le X-Google-Smtp-Source: APXvYqw1SYiMum+GIfBMQhBNYlOsLfrFAZzMaNkxIBCP3NdtEp34jAeRiuBVYfTgcB8Oqva9QLsM6Q== X-Received: by 2002:a19:385a:: with SMTP id d26mr1350577lfj.137.1551881101428; Wed, 06 Mar 2019 06:05:01 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:00 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 1/6] mmc: mmci: Don't share un-implemented DMA functions Date: Wed, 6 Mar 2019 15:04:51 +0100 Message-Id: <20190306140456.28187-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> Some of the DMA functions are shared via mmci.h, however they are not implemented unless CONFIG_DMA_ENGINE is set. Therefore, add that constraint to the header file as well. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.h | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.1 diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 14df81054438..b368ed3acc29 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -429,6 +429,7 @@ struct mmci_host { void mmci_write_clkreg(struct mmci_host *host, u32 clk); void mmci_write_pwrreg(struct mmci_host *host, u32 pwr); +#ifdef CONFIG_DMA_ENGINE int mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data, bool next); void mmci_dmae_unprep_data(struct mmci_host *host, struct mmc_data *data, @@ -439,3 +440,4 @@ void mmci_dmae_release(struct mmci_host *host); int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl); void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data); void mmci_dmae_error(struct mmci_host *host); +#endif From patchwork Wed Mar 6 14:04:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159748 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6205989jad; Wed, 6 Mar 2019 06:05:03 -0800 (PST) X-Received: by 2002:a19:381c:: with SMTP id f28mr4256543lfa.169.1551881103279; Wed, 06 Mar 2019 06:05:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881103; cv=none; d=google.com; s=arc-20160816; b=KwQfUc8v/7RVB4SwTPTC6BMdHJHIQNboyZ3PfR0d+bsdnyETJJsyFk95SRcQloxDoI MiQUosBD2OIc4rnoRHDpMuuidmC0KqjtCQRTl0HoUdrZtvfPkAlxU7fhCame3NHRBSRK FTGHLW825fH9yUjjvpvTlM5QQ8Aqp0PIWRl28sBn9hn6D/DAlUffSMKFabySOqoNggJJ WzL4p1DEf+Y8OS+XXSXSP1j1/Sc3dp4bMJUAClAs67a5tSNf+870GUsXmNVReScmlEmH sBN2tfJEaXtMSYCyzVwtZ6VB8FlmpO/+N+ZzvuLZ6jI8NeTnEhujxKIMDZnG/oY2n86O 1drA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cnQWFgoj5dStb9SDgruunD1B301/yL7MXH4brDMgT0I=; b=k7nGcnNcsjXi/bwkL/+ngsyulJh0T3geciLLUBgoJB37n74ATk/SdZXCW1e2qeqaQV fTIsd3F08iupiqYfwjpFkux+Z+65LcCnDn0hQ5+i2mpe7/Tkqt8l83lWTmr7klhwVxSy ZosX27er9oP0Ddh17DGSGSVXANfEuofMrHbE/Sao5zigtt+9mae8GpbOZIsdHNKvGMS4 3CqjXoobma5JhwoTgBq2J0ENR7JyIdhNrPJ5mhbGuVPZWFGzoBax/3CbGLuea5EGwOMq hVbwNvt11KJdFF3xd2taw8hNLPa1PlWcfYElIMo/RVqZHphF9PmrM1USaEdpQSuQa44o aosw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fKui5pBs; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h19sor548811lfh.5.2019.03.06.06.05.03 for (Google Transport Security); Wed, 06 Mar 2019 06:05:03 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fKui5pBs; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=cnQWFgoj5dStb9SDgruunD1B301/yL7MXH4brDMgT0I=; b=fKui5pBsDoW5m0iU6XU2css8QF2T0fMTM9EYtO0OcvnD+R+kl0O27h4IHQ/D4oRbG9 2IfoXM+rmAPHw/sCcdYO4VEWL+7mipKon1ROMzAZ9FX5EFwhnuAvQuDpol+W46i0QoQL 9UxrigVKL8P4YG8xzh9m8A/c4lMpHgP7LiUT7NCi50pYS4Rbv8PeMyR4XsFVEynMGZUu +sz49O/BoZsU3ltubFjMPeRUzXcUHjKLkvwPxPkNc3CTN5QhAHDFOeSg0CbQFQQTNGqq H2cOOzrhL2llOthnnrxCXn/uDXJuFy0V0DcI+MXxTZ/jb98rNCNVld8Aj8jSlLMpezjt bgrg== 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=cnQWFgoj5dStb9SDgruunD1B301/yL7MXH4brDMgT0I=; b=bH5+eOX4NmpMZ1UnYnDIZK21bR1WJubqAakA17oyl8ts4F+FFY8xvLt7pg/eACfdYt nkwJt3se/fysg0EhyWfDAIkcSE0N51mInb4wyE7ksaxV+nRbncnxa6DpNrNeLON3rS9c lJYhp5hvM1hS5aa3Jm9T70hWm44P+HobS85p5TL6LniqF3zVur7CcjB+7THAdJzoVBAV NEgEqdyhW808eHBCNTHyO59kcULUU8E3h+caHNyNjcLumb8bILglZqybBAF6BtDTfYB2 dWAMS8nvT8D3WvSOf3Io05lWkueWbRVQeiY/9722zoW4ntnomLFnBMRmROs3YnU+xqWi ya5A== X-Gm-Message-State: APjAAAXHd3etp7dnjDm7S+2U2v4n/6jTHHvtNiqvWuK0uaoouLQyBVy4 E/YSHn/mSm4JcYRGKerV+VavqQzG X-Google-Smtp-Source: APXvYqxScOwDJQve8oKkRyRPtJxLoo+Nix97UXS3Aa8oYhj3ZQsKhI9hhTocilAWUgaDikXdsAAXVw== X-Received: by 2002:ac2:5607:: with SMTP id v7mr3908412lfd.50.1551881102842; Wed, 06 Mar 2019 06:05:02 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:02 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 2/6] mmc: mmci: Drop unnecessary clear of variant->qcom_dml flag Date: Wed, 6 Mar 2019 15:04:52 +0100 Message-Id: <20190306140456.28187-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> There's no point clearing the variant flag in case the qcom variant fails to setup DMA. This is because if mmci_dma_setup() fails, then the use_dma flag remains set to false, which leads to mmci using PIO mode and not DMA. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci_qcom_dml.c | 1 - 1 file changed, 1 deletion(-) -- 2.17.1 diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c index 25d0a75533ea..b942d4aeeb77 100644 --- a/drivers/mmc/host/mmci_qcom_dml.c +++ b/drivers/mmc/host/mmci_qcom_dml.c @@ -133,7 +133,6 @@ static int qcom_dma_setup(struct mmci_host *host) producer_id = of_get_dml_pipe_index(np, "rx"); if (producer_id < 0 || consumer_id < 0) { - host->variant->qcom_dml = false; mmci_dmae_release(host); return -EINVAL; } From patchwork Wed Mar 6 14:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159749 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6206029jad; Wed, 6 Mar 2019 06:05:04 -0800 (PST) X-Received: by 2002:a19:2c52:: with SMTP id s79mr4049060lfs.32.1551881104756; Wed, 06 Mar 2019 06:05:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881104; cv=none; d=google.com; s=arc-20160816; b=x1ftmyDyC2B+sXLSy6aBFflvQ+fu6qmdzjYCR/jF7g+4zxlFJbiQAqFYT2iZ+wi2IB bOiGeWTvtzkXve9MyL79p1Aybjqc4iupvoKz0OtAKUwMpH4WmuRF1AOENteP+k8ykaQC HO846a7ahE3JGFFM1zo6Yh2Siw7391QD8m0E9TKY/e4/B+PIjy3cmo5s51fuqol1yDDQ oQnRt299LK6pmkK9CL3e4b9+ZfxNde4RR+NvUKKppH4xppQwEtcgtwRo1/tZxdrkG5Z6 anTNitS4jYwEXA/ymXWv3WvD5lC6wUiO8y7COeTmiRHo4qlOhURTD2GDsySXtu+VJOWV 3O0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tlCKbtc89hKabNuZVImSO48JykyWQKwHDx3+KQ8Sj7Q=; b=C8vlSkRtC/UIhaWbe+Ir2MlGD9ot0+SVRTd3rRfI0NJocsOAOBsZDsqOJzXKOYgzNE QMTfANVd8ahDrta6POM/e56llhqUKrLaMhUpgnjBEeYdDkmOwaHouIZU6jxpIGwwyZW+ uyNpW9sdMKvMqKwRNQ6WT9cl/i9l0dt7HQIOph3UR8xAm/oSXrZuv7ebHW0whLwoOfZX 9FFMrfjrK39O/BlEyQi0Kvlo0Glwxx1jM4GXXSJiS83ltSIfFRozpSORoq818+oZiVqe EPX5yG9kMk8Qoi3S4vA7Q3y/7uEYRbsNW7QdVQLVDw32vEF/fQ0va4sEe20R/BgmNYqv 5Mig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vuREW4WW; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j7sor546820lfb.15.2019.03.06.06.05.04 for (Google Transport Security); Wed, 06 Mar 2019 06:05:04 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vuREW4WW; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=tlCKbtc89hKabNuZVImSO48JykyWQKwHDx3+KQ8Sj7Q=; b=vuREW4WWOXmbiTtxtpOHH8V/JWTC+LGxPeWUW/aMAluDJ5JOi5+IRtz6CHPC9UbjMp xJOh+3HvwNAywaJsLtf363YqxO/PRcBxaaYBAMF2+pA90Ftvc79IRd8KYDhTOB95vQrY rtBCCWKHbhblhCehpVFDqB9PvQXzYWNU7wdhru4z9Gjhq0sNr9TVJtb7ve5XegHzQcFo q9tXt5nf7G5Z4m/cna9IUigyvQyKCr2WlGO8gfFkYWueg7oglJt0GBzh9LU7Kq1+baez ScIKbnmcxiAI1WbgG/eMcL0EWXW0BKrsoShBiQE4RhPl+wVckmi9QTTZ4gYc3XDqKCoU 9Z6A== 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=tlCKbtc89hKabNuZVImSO48JykyWQKwHDx3+KQ8Sj7Q=; b=pXJTrKpUJT03ie3ADH9n4ufjCjn1+tfz+QfH1IDEGLGcbh+wWBrQ8Y/dQCflycpGVE 1qeWO4Svbl0VL+ljLD0mgLJ3NF9aZvB3H4406k+rATKqqeRLv2a4wI/LGPJXTdya5GnA nYZTq3YmmvBonuCH3ORrKnWeLH3VEdCwaWXNngtS4/z6kFSocUnDf74sKwR3a3aZcxl2 YcnPfQkKAuMSeZgWVm9Cz2GSXelq5yOd/VEeDUlfiX6TEN90x3hYUfN6qDvwfu1Mi9L/ qrCQEjia6blI7OsYtOGeFgN50jdp0fiogXyLBX+5H1+Dcvhga9qwJtGzK7wG7pmpA0Z5 YDxw== X-Gm-Message-State: APjAAAW4FjmZIB7Ewy/NiWZMxuEhAlZ3cjvLNO6ZJmv/d85KyuPuk4rK TWeWXXnU45HjOEIdA75+BYJr0+PP X-Google-Smtp-Source: APXvYqz1d8TudKxLGHrAAwFo2B3/LViUwnoNMpXd1Qb/AiDtOl9u+BAejR/hagpyqlgu0paFU/+f4w== X-Received: by 2002:a19:6554:: with SMTP id c20mr3947873lfj.15.1551881104221; Wed, 06 Mar 2019 06:05:04 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:03 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 3/6] mmc: mmci: Re-work code starting DMA for the qcom variant Date: Wed, 6 Mar 2019 15:04:53 +0100 Message-Id: <20190306140456.28187-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> Having mmci_dmae_start() to invoke the shared function, dml_start_xfer(), explicitly for the qcom variant isn't very nice. Let's clean up this code by moving the qcom specific parts into the qcom ->dma_start() callback and then drop dml_start_xfer() altogether. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 4 ---- drivers/mmc/host/mmci_qcom_dml.c | 10 ++++++++-- drivers/mmc/host/mmci_qcom_dml.h | 4 ---- 3 files changed, 8 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 387ff14587b8..3e5baafb0ce2 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -886,15 +886,11 @@ int mmci_dmae_prep_data(struct mmci_host *host, int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl) { struct mmci_dmae_priv *dmae = host->dma_priv; - struct mmc_data *data = host->data; host->dma_in_progress = true; dmaengine_submit(dmae->desc_current); dma_async_issue_pending(dmae->cur); - if (host->variant->qcom_dml) - dml_start_xfer(host, data); - *datactrl |= MCI_DPSM_DMAENABLE; return 0; diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c index b942d4aeeb77..ccc1b1809e73 100644 --- a/drivers/mmc/host/mmci_qcom_dml.c +++ b/drivers/mmc/host/mmci_qcom_dml.c @@ -54,10 +54,15 @@ #define DML_OFFSET 0x800 -void dml_start_xfer(struct mmci_host *host, struct mmc_data *data) +static int qcom_dma_start(struct mmci_host *host, unsigned int *datactrl) { u32 config; void __iomem *base = host->base + DML_OFFSET; + struct mmc_data *data = host->data; + int ret = mmci_dmae_start(host, datactrl); + + if (ret) + return ret; if (data->flags & MMC_DATA_READ) { /* Read operation: configure DML for producer operation */ @@ -96,6 +101,7 @@ void dml_start_xfer(struct mmci_host *host, struct mmc_data *data) /* make sure the dml is configured before dma is triggered */ wmb(); + return 0; } static int of_get_dml_pipe_index(struct device_node *np, const char *name) @@ -188,7 +194,7 @@ static struct mmci_host_ops qcom_variant_ops = { .get_next_data = mmci_dmae_get_next_data, .dma_setup = qcom_dma_setup, .dma_release = mmci_dmae_release, - .dma_start = mmci_dmae_start, + .dma_start = qcom_dma_start, .dma_finalize = mmci_dmae_finalize, .dma_error = mmci_dmae_error, }; diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h index fa16f6f4d4ad..7e87eb9c4238 100644 --- a/drivers/mmc/host/mmci_qcom_dml.h +++ b/drivers/mmc/host/mmci_qcom_dml.h @@ -17,14 +17,10 @@ #ifdef CONFIG_MMC_QCOM_DML void qcom_variant_init(struct mmci_host *host); -void dml_start_xfer(struct mmci_host *host, struct mmc_data *data); #else static inline void qcom_variant_init(struct mmci_host *host) { } -static inline void dml_start_xfer(struct mmci_host *host, struct mmc_data *data) -{ -} #endif /* CONFIG_MMC_QCOM_DML */ #endif /* __MMC_QCOM_DML_H__ */ From patchwork Wed Mar 6 14:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159750 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6206063jad; Wed, 6 Mar 2019 06:05:06 -0800 (PST) X-Received: by 2002:ac2:4304:: with SMTP id l4mr2649120lfh.168.1551881106049; Wed, 06 Mar 2019 06:05:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881106; cv=none; d=google.com; s=arc-20160816; b=kHCO1L953is+TWXpijylcHv3EShMiqbEf8O00RS94ehJki2NAbA5jUutWe/rcmocLU QC+/1v4S7SpyYKzXd+dhEje6+jM2sZ7FsQ51CYZVzGzKaouA6YEhcxq53b9MdbLGrrn6 U3phip5gDSbNh1qxbievt0oa0fTgscWbRqdxvvgdd3Kn58LvkDBF92R66wI1NSzkPEhj J6B+/4s4EvEA4cPIyYAzF/Kj2XOSpbnmoDzJrr58GUcggmgLxCaSJib1A0fElzkNF8ya GJOK+MgGsVguBQxLIcBl2csucb45AmFfGU0d5aQpzVAipqm8hIG3Cvx1678nOT7K50sh c7lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DoU/c8AEdNJbAcgJ5zF6LsgzuA1UsaqrtPFabjRv7AE=; b=0YrwBhtNQyj9IGhW0FCsIkalBxrOxJaIQ2sGNCpejwm6CXYD7gopIYwgXNCktqLKRI +EsBAEWgk3QFGJBtd5VfXBMCt9IddfLNDJE1WHMGvR61Zlplmzvi1PT2Pgfne2d+0H4I WbJcRuCdP9MxYI/T+H4iwPMtVxQe/NNc5V5CM+Wt3ch0X4jIGJISEVso0hvgiRPUnkKS /6kZ5FSChAouwMxYPIglA42qC2P1Hzt+KOb1ynM1Olp0csj1txggod/up8ipt1C+NEoW 7+uaL/2jzfy5W9n74FghAdP2h1LOJBCpmfTO7JgjDL3/0dgC5VGChE4cPi2m7eg8DqcA uYmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X81Cgmbk; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l13sor515402lfh.31.2019.03.06.06.05.05 for (Google Transport Security); Wed, 06 Mar 2019 06:05:06 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X81Cgmbk; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=DoU/c8AEdNJbAcgJ5zF6LsgzuA1UsaqrtPFabjRv7AE=; b=X81CgmbkJrTeNXFa9+xsArINNs5x4qGHJTIInvaz3Zm6s8is9e+/Ty15eEoPk+CksV mtqhVYGXak/a2Dk3ZxWZ5LF3pvnHtdVGRkvuDWmGdDcJ/4SlW9NHIDGldPVAQKyFiOOa poZhmDAjx9tRXfjiouxa3n/gaduiUlQ6vbJuWNEkJa8zug8zx8rWg7JESNOnMAq1iDVN 4DRQXm3218BqbHR2bJNhGGNjNhbhcWZMosB0ALt/iqIZozvyBF37+6WNXpeBvzGT2FCl YjlZk8F7tIY554i8cFOOujJ8g9kubPQ8ehl8kyD8RIEMa+HXwkliFBJljm4pz11jxe6f e7BA== 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=DoU/c8AEdNJbAcgJ5zF6LsgzuA1UsaqrtPFabjRv7AE=; b=EwJdc7Eb6eHl+FeEzwoho9LXZYCxRvA1rPMz1DoPCwt08bC3so37ZygfRZnJmLrvPx 49OanX9M/Z1bEnf3zQPyhnBVble6zROhU4XUUyRlkWDbQflBfxTGpA//7QkCHM4R93Wx BUXEXxPi3Y3OxP5it89oK9c7qwIDO3un5tph9TQkCjksy0Dx8d0dxNxOP4y6UEkcCRCL DT6t7XkxQGaKw+VHjeL1HSbTMnjyfiutgf3TksikFWyV8JUv08eRZ9O6bfBExywe2c2u 95Y289464i6jvnFTvivCYP+IqYVBK+hDBaO2TmSfXRpbAV4wNu/gorc+SOn59A2PL3vi aqVg== X-Gm-Message-State: APjAAAUP+2fpr32JEa/rfjy2cquZ77TbiA/f47F1tM3RLPoUdPwbXROt uShylySz6+092yLiyq4tFYct7zaY X-Google-Smtp-Source: APXvYqxLmTisYem/Mvlgf5kZsqthWrmZf2Bry9q8DsQ0aFkQoAmqUtcHbr4y86dim3xV/XphFViyig== X-Received: by 2002:a19:f715:: with SMTP id z21mr3578668lfe.45.1551881105494; Wed, 06 Mar 2019 06:05:05 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:04 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 4/6] mmc: mmci: Drop qcom specific header file Date: Wed, 6 Mar 2019 15:04:54 +0100 Message-Id: <20190306140456.28187-5-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> It seems a bit silly to have a header file to share only the qcom_variant_init() function. So, let's just drop it and move the declaration of the function into the common mmci.h instead. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 1 - drivers/mmc/host/mmci.h | 6 ++++++ drivers/mmc/host/mmci_qcom_dml.h | 26 -------------------------- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 drivers/mmc/host/mmci_qcom_dml.h -- 2.17.1 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 3e5baafb0ce2..e11fc5019535 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -43,7 +43,6 @@ #include #include "mmci.h" -#include "mmci_qcom_dml.h" #define DRIVER_NAME "mmci-pl18x" diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index b368ed3acc29..a76fe1085757 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -441,3 +441,9 @@ int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl); void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data); void mmci_dmae_error(struct mmci_host *host); #endif + +#ifdef CONFIG_MMC_QCOM_DML +void qcom_variant_init(struct mmci_host *host); +#else +static inline void qcom_variant_init(struct mmci_host *host) {} +#endif diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h deleted file mode 100644 index 7e87eb9c4238..000000000000 --- a/drivers/mmc/host/mmci_qcom_dml.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * - * Copyright (c) 2011, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ -#ifndef __MMC_QCOM_DML_H__ -#define __MMC_QCOM_DML_H__ - -#ifdef CONFIG_MMC_QCOM_DML -void qcom_variant_init(struct mmci_host *host); -#else -static inline void qcom_variant_init(struct mmci_host *host) -{ -} -#endif /* CONFIG_MMC_QCOM_DML */ - -#endif /* __MMC_QCOM_DML_H__ */ From patchwork Wed Mar 6 14:04:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159751 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6206082jad; Wed, 6 Mar 2019 06:05:07 -0800 (PST) X-Received: by 2002:a2e:818b:: with SMTP id e11mr2606961ljg.104.1551881107233; Wed, 06 Mar 2019 06:05:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881107; cv=none; d=google.com; s=arc-20160816; b=q0u/TNWaaSC72CB8UhpMONVEq5jWl95Xxkctwwz/iD6164yzvD8Q21GtaczppprO8y BTbTSPMJMn8MYKTnUjkgh/aWs93XbBqpfczrAH+g2/yvyOrQEeQso3WKsp32/JjFnklP oIpNMjW+zARj1PXvPqAZxa7/By59iwq61wxbJILOXfK0104RuGUJicIu34YWhGUE9co7 aG5ne6RrvBpbs5AN0sTK9oR4S7ZykB6zOJt7XaUOYMyZ/mEpTOpAHBQfBopLJuW5rZVo BPb0jZwRLeoFFSoIB61ISbw4BCSvAOE+AGPHy6s/d+CFyg1SgGs+g0SdvK3kJLU6dDDy xgXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TgXa43oohEj4CgD4f1ipe2rPTFKtZ11pZj9jyv+WNJU=; b=BnZuUlK9aEQHSqjyVmFjYMpKVLzqg8K1WNMTKEUdGJ2QsOKkfImKieNgN/APHiaX0s vjwiu+GHwEu+Wm2tP7lC771ruShWrBsb05K+j/l7iqmmo6h/jCGBC6Phwc/w7kzpsot6 2LM5rnPX+kYPU5FHscvvmxh4x2o9mUjf/aaw+F1qPyG+/hTl8Fv2CLIKOmdty6K7Tbv4 PVpG/LEeBI9LPPa0h6RbUy58ngBLGEMd9uLVGKcUBqzblSquvdPA/FC0I1pWo/LJjL12 09hMgl8gTTz32gG6JH96p+PfmgBxulppHsyxAf2kMf4a1oSU5hL4EcJy2JfqTaRj8M9k Mh7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yfeyCABW; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l187sor541291lfe.2.2019.03.06.06.05.07 for (Google Transport Security); Wed, 06 Mar 2019 06:05:07 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yfeyCABW; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=TgXa43oohEj4CgD4f1ipe2rPTFKtZ11pZj9jyv+WNJU=; b=yfeyCABWQXAnqLbK1AMf7nqZVzitr2qzhtKU3TMwoF0Oeqv/XuMh45nBoP0hhUtjmo es4W8SDXZ2BwghFz0UsEQ627e5mXgnseeq2u1g+higf242YfmeYhJ+Uxe9SKb6MMD1nO 3E0GM88spkT+Sl7NEdLaxNfjpwTrVObd4QkRr9P+fjvdgl6jXeTC+V83D158bR87WpFs SMT6SnP85L4gI512UbwCk1INot9d28ngKtU8XbfeDOpI8q0e5kL54Xl6L8ElnVYN7uyD 98ddd21dya2OvQUXA2xxqkD6xBchlnAh1qxjZW/b6HvbN3jd5aqmt9wT2cfhmbz+phrx jTcw== 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=TgXa43oohEj4CgD4f1ipe2rPTFKtZ11pZj9jyv+WNJU=; b=kWgqCjs15LLr0GKSnruQdNisjl+AY/zaGFihFlkU2PihcPzUxLHJwf02oGfElXO7so hwfFiPvXZiwYlELImDpoM+UWWke/KmDZskiatAdHShIgDH/HxyGNmnzwq3MIiemV00oX +Hcy/Of2JzO1Jgedvn0+isWb5akiGq8wfd8QJaG5MqlXffkAp5QEnMtlXKZ8c4UNpedF CmG9F/051IVx+bnCHvBdJBjEQiPnR6B5EcDZ2jKqyeWtYwXVXcma2ojmOeYog/JCtmu2 SmOMuICjV0yQNCLiVUm6U1YLqLH5+8nqQVn5sNqfsJ4v+52TxowyH9nsUs2PnhM986wu bclg== X-Gm-Message-State: APjAAAXrTMdZHsrVS+/pdnGFkiK7R+oiN6k4CcqyGatzrmavABPIN/LR g6iuxWH++f0QuHWeIw4wz6Glf2SJ X-Google-Smtp-Source: APXvYqwt8MRFJCHGmUU5Yk4G0Smkbt9hT4L068TyDR9NhjLldDXVIB7RA5cSxYRPTrtN5dM+SYqYoA== X-Received: by 2002:ac2:568f:: with SMTP id 15mr4050883lfr.94.1551881106857; Wed, 06 Mar 2019 06:05:06 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:05 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 5/6] mmc: mmci: Share sdmmc_variant_init() via the common header file Date: Wed, 6 Mar 2019 15:04:55 +0100 Message-Id: <20190306140456.28187-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> It's good practice to share functions via header files, rather than from the c-files. Therefore, let's move sdmmc_variant_init() to mmci.h. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 6 ------ drivers/mmc/host/mmci.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.17.1 Acked-by: Ludovic Barre Tested-by: Ludovic Barre diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index e11fc5019535..2f3a1a7bd465 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -52,12 +52,6 @@ void mmci_variant_init(struct mmci_host *host); static inline void mmci_variant_init(struct mmci_host *host) {} #endif -#ifdef CONFIG_MMC_STM32_SDMMC -void sdmmc_variant_init(struct mmci_host *host); -#else -static inline void sdmmc_variant_init(struct mmci_host *host) {} -#endif - static unsigned int fmax = 515633; static struct variant_data variant_arm = { diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index a76fe1085757..6bde28c9b302 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -447,3 +447,9 @@ void qcom_variant_init(struct mmci_host *host); #else static inline void qcom_variant_init(struct mmci_host *host) {} #endif + +#ifdef CONFIG_MMC_STM32_SDMMC +void sdmmc_variant_init(struct mmci_host *host); +#else +static inline void sdmmc_variant_init(struct mmci_host *host) {} +#endif From patchwork Wed Mar 6 14:04:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159752 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6206114jad; Wed, 6 Mar 2019 06:05:08 -0800 (PST) X-Received: by 2002:ac2:50d9:: with SMTP id h25mr4009119lfm.138.1551881108502; Wed, 06 Mar 2019 06:05:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881108; cv=none; d=google.com; s=arc-20160816; b=mzY+kyBXK/MNA0R6Y5rhxjTtoDuh1RUr3i/OzjaZDQrH+P5XzmDPxtwx9NYIM4jf1a iTvfzfsgt5x3lfrloXRzlZ0BGhCO/AGEC+SaAc0G0NwjAYlD27a76STpuQCjp0msfftU Rm0Zyssw9pJdZLU7rc4iUtC1VNKnIisuiijXFYPji12vRgTvVwZu5655hIWkz9GXs2u7 6enye31Ciq6LK8U8hwcBpGgAKQ/07DNUXMQhmU+4oqFg7Jr2SVge4XM7rzEyVss+sddP FY4UHJh07bI9JACUIz/fE/rAv4OGu8N5v4+kzkKWmdb5rZFzxIJai2vdpZw1gU+43c3i sOdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bmi4m3jgLs9znziaLF9DN+ZPJU4BIj67VpqbfVcVR5w=; b=mEUpFK+IbQz9J1/nhwdhiB1Wm5cS3JhDfBz89PNTV1Ga0A9ekdUZekv4+apHGq7Xr7 mzwfp5Rq6DUsixV4MqXnnNWi0f42Hfo5jnSJhkBASdOiwM9kwPTXHQXEugrrg7mFPuHU 1bqzf3hSIdFM+OEHTOtQI2rnGndtAwgUfH+HVauIWTQu6yGB5K9nAu1m6POzr0mCWfER dvzA9tkvFZ6u9E6K5Fw9gOiN/OENoBZVSqjzYtZ+5Ex5QbI0YnF250PdAc9jibs9D6Ja XQoYoeuVmL44U0FhJpHqoUR5k6JzTIx6q0U41qvTsHuFTSV42KCrzmigauOy9SvQOa6D maCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UmAltG1g; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id n25sor534489lfg.44.2019.03.06.06.05.08 for (Google Transport Security); Wed, 06 Mar 2019 06:05:08 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UmAltG1g; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=bmi4m3jgLs9znziaLF9DN+ZPJU4BIj67VpqbfVcVR5w=; b=UmAltG1g8G1KMLmf+5NtLdn6QGq4fmaai68psnCpVdljUDlEgzKIn7NwaDOCdV/9ZJ Uj0JI3YU8XrQQ3Eubh8kOL6fGth6H76MJHYvG64CxqUuyq8z+aY3WSvmapDreyLYoIqZ aYj8fGDhYe8yHGhEplH2Fp+2HDcv5415JvrkFyd/VaXQyqreKi7fu3Qnh4tMXT0GQl31 /O8JD2htizhi3JtdKy+KkWFz4Cyx4T5HP6C3gg+SwKzcIAxEuVT3N2WF5Inrlqr1AogU FXlJbIWGiMT+EEk2qDaY2QjptkR9bo5yC9eVRD9sad1k/7MS4hM+sKYP8GNEW0N/g8CM GjpQ== 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=bmi4m3jgLs9znziaLF9DN+ZPJU4BIj67VpqbfVcVR5w=; b=lreYCOdz5HScnUpn7k313bq3esIYASfyz73s9NScWbtRw27k3Eq9SBmdpD0zLA7cGF u5YRYYRrkSb+rvBTmaxggQTRXG6TPvu9VYlMvDoEZpXCuhcq0sX/seP06d0VGfycwZ2E AwBGg51Vse6tRUnDnB57+7iBCGpdQgzn6d/DxEOnkhfJHnd0qzObwcWuokcmmXDCWzDT sqPXcp5CjxfTpfmyD8WV+ygFFFpxak9oTCl/kEMQVDsDzijhRRyj+y+0BI78GcG/XPAs DAoGD0CD0h1S8WHpEX/UGHC9CVnyAZW0uvbeBoMU/46TfjHgjXcXivP++Rr84DWD+v1p hCsQ== X-Gm-Message-State: APjAAAUgglBSprWr5soPKdWdInWSGvQ34yx/wIPG2Bzn7mqjlzafUU0/ +pX5gQqHLBrvw2Oxel092iOWwau8 X-Google-Smtp-Source: APXvYqyJlvy1AUDxscXay2CzbawHfrtvipHXWpY1rrej8CMd7dCsI1xkj2qtJz1pHMtXZ7Wr4k0Ksg== X-Received: by 2002:a19:ed02:: with SMTP id y2mr4262473lfy.24.1551881108130; Wed, 06 Mar 2019 06:05:08 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:07 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 6/6] mmc: mmci: Make mmci_variant_init() static Date: Wed, 6 Mar 2019 15:04:56 +0100 Message-Id: <20190306140456.28187-7-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> As mmci_variant_init() is a local function to mmci.c, let's convert it into static. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2f3a1a7bd465..9e6a2c1aecd6 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -47,7 +47,7 @@ #define DRIVER_NAME "mmci-pl18x" #ifdef CONFIG_DMA_ENGINE -void mmci_variant_init(struct mmci_host *host); +static void mmci_variant_init(struct mmci_host *host); #else static inline void mmci_variant_init(struct mmci_host *host) {} #endif