From patchwork Tue Sep 3 09:29:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 19700 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE31824869 for ; Tue, 3 Sep 2013 09:29:58 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id i13sf3057794qae.7 for ; Tue, 03 Sep 2013 02:29:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=YV/xxAA6Wr+8PVA9PEMG25Sowh+l0/bMdNMhnexjWFw=; b=I4OFSUbeUqkEKR6fIQOkCgH15WvB0VYUj9cbx2DRWn/wCqoex9Nik+XaLTF5GIgpeG lZUjw8hRvp1C7CvWt+USJxQhAewd5xn9JiJmLiG2AUttZWyRsAgppmkFIaBg/l6P/Lo+ 3V3rbZ7EZ3OP7RYFINnKEIw9+nrsxRkqUx9db9JpVeQR+LhaHoZcOFgO+gIRs1U2Q4lh YKrT2FUHzFdqJw/BojjOwbNsMFbyit01mHGSk+OdUwtC2rcF0AFkXmoH2vcvraXB67pK FxwEBKeuBktJoKlAeZcgDR03lUIvgqSjXJ3bTyxPadTtvtEGaFRSChKi89YcXf3T5L7d n4Lw== X-Received: by 10.236.116.135 with SMTP id g7mr295843yhh.53.1378200598451; Tue, 03 Sep 2013 02:29:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.70 with SMTP id i6ls1354785qei.26.gmail; Tue, 03 Sep 2013 02:29:58 -0700 (PDT) X-Received: by 10.52.249.102 with SMTP id yt6mr22612020vdc.21.1378200598338; Tue, 03 Sep 2013 02:29:58 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id sn2si4176199vec.140.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 02:29:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ha12so3655038vcb.37 for ; Tue, 03 Sep 2013 02:29:58 -0700 (PDT) X-Gm-Message-State: ALoCoQnY2m+U85qrCPG6RcCr7aRhNcDH4IFSTpZAfcIvQr5YSl44Ly8Em+XFMusEsc9fQUzvZicG X-Received: by 10.220.140.69 with SMTP id h5mr27459744vcu.0.1378200598250; Tue, 03 Sep 2013 02:29:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp160137vcz; Tue, 3 Sep 2013 02:29:57 -0700 (PDT) X-Received: by 10.14.10.1 with SMTP id 1mr297132eeu.81.1378200597149; Tue, 03 Sep 2013 02:29:57 -0700 (PDT) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by mx.google.com with ESMTPS id i5si13718749eeg.355.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 02:29:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.171 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.171; Received: by mail-ea0-f171.google.com with SMTP id n15so2855884ead.16 for ; Tue, 03 Sep 2013 02:29:56 -0700 (PDT) X-Received: by 10.15.91.3 with SMTP id r3mr45244651eez.4.1378200596626; Tue, 03 Sep 2013 02:29:56 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id z12sm29882771eev.6.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 02:29:56 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King Cc: linux-mmc@vger.kernel.org, Chris Ball , Daniel Lezcano , Linus Walleij , Ulf Hansson Subject: [PATCH V3 1/4] mmc: mmci: Adapt to new pinctrl handling Date: Tue, 3 Sep 2013 11:29:33 +0200 Message-Id: <1378200576-13413-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1378200576-13413-1-git-send-email-ulf.hansson@linaro.org> References: <1378200576-13413-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , There is no need for every driver to fetch a pinctrl handle and to select the default state. Instead this is handled by the device driver core, thus we can remove this piece of code from mmci. Signed-off-by: Ulf Hansson Cc: Linus Walleij --- drivers/mmc/host/mmci.c | 17 ----------------- drivers/mmc/host/mmci.h | 4 ---- 2 files changed, 21 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index c3785ed..5dffbbd 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1510,23 +1510,6 @@ static int mmci_probe(struct amba_device *dev, mmc->f_max = min(host->mclk, fmax); dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); - host->pinctrl = devm_pinctrl_get(&dev->dev); - if (IS_ERR(host->pinctrl)) { - ret = PTR_ERR(host->pinctrl); - goto clk_disable; - } - - host->pins_default = pinctrl_lookup_state(host->pinctrl, - PINCTRL_STATE_DEFAULT); - - /* enable pins to be muxed in and configured */ - if (!IS_ERR(host->pins_default)) { - ret = pinctrl_select_state(host->pinctrl, host->pins_default); - if (ret) - dev_warn(&dev->dev, "could not set default pins\n"); - } else - dev_warn(&dev->dev, "could not get default pinstate\n"); - /* Get regulators and the supported OCR mask */ mmc_regulator_get_supply(mmc); if (!mmc->ocr_avail) diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 69080fa..168bc72 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -200,10 +200,6 @@ struct mmci_host { struct sg_mapping_iter sg_miter; unsigned int size; - /* pinctrl handles */ - struct pinctrl *pinctrl; - struct pinctrl_state *pins_default; - #ifdef CONFIG_DMA_ENGINE /* DMA stuff */ struct dma_chan *dma_current;