From patchwork Mon Sep 22 23:49:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 392186 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 52F0D1400E7 for ; Tue, 23 Sep 2014 09:49:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755305AbaIVXtQ (ORCPT ); Mon, 22 Sep 2014 19:49:16 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:45190 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686AbaIVXtO (ORCPT ); Mon, 22 Sep 2014 19:49:14 -0400 Received: by mail-pd0-f181.google.com with SMTP id r10so5401297pdi.40 for ; Mon, 22 Sep 2014 16:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=zDKqtyvRiDhaBHPv0bzDyutUcnhFSr6mMJaTIZUWuEU=; b=WcLGu4jj6pZ/4y/7nMl43D3l3hm4xrwqY5GKt5Y8GTRZbq/h0P6V/abt/AGFtu8Iq5 ujjtSSxJWENxZ2TvpjYT9Hk1Ubsp5GGIwoijPvGleuRcqGoutZX25SySLYjlSHQJfO/c J999Qc8F2869s9SV8UXavUfDpCmi7qk7s9goQFhPMq/T7EX9oik5gZPmV70ztqUmA00O +q9gfPy9ok69AXJNzP8ZYqeGrieY7GflF7L+av0ufymlrss6hxCa5V7D81y9365+8rLF ssOk7Hg6Y+RUscpyUE4ntuI6JdTzcY3HhStg56dNnhflREM9iA0yvq6Q9LoIheRziE6B cqDg== X-Received: by 10.66.189.68 with SMTP id gg4mr30515793pac.48.1411429754491; Mon, 22 Sep 2014 16:49:14 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id fq11sm10373102pdb.42.2014.09.22.16.49.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 22 Sep 2014 16:49:13 -0700 (PDT) From: Soren Brinkmann To: Nicolas Ferre Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Soren Brinkmann Subject: [PATCH] Revert "net/macb: add pinctrl consumer support" Date: Mon, 22 Sep 2014 16:49:08 -0700 Message-Id: <1411429748-31444-1-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.1.0.1.g27b9230 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 8ef29f8aae524bd51298fb10ac6a5ce6c4c5a3d8. The driver core already calls pinctrl_get() and claims the default state. There is no need to replicate this in the driver. Acked-by: Nicolas Ferre Signed-off-by: Soren Brinkmann --- Hi, I might be mistaken, but I think the driver core does already take care of calling into the pinctrl framework and the driver does not need to do it on its own (drivers/base/dd.c:really_probe() calls 'pinctrl_bind_pins() which takes care of the pinctrl setup). Thanks, Sören drivers/net/ethernet/cadence/macb.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index ca5d7798b265..e1e02fba4fcc 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -30,7 +30,6 @@ #include #include #include -#include #include "macb.h" @@ -2071,7 +2070,6 @@ static int __init macb_probe(struct platform_device *pdev) struct phy_device *phydev; u32 config; int err = -ENXIO; - struct pinctrl *pinctrl; const char *mac; regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -2080,15 +2078,6 @@ static int __init macb_probe(struct platform_device *pdev) goto err_out; } - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - err = PTR_ERR(pinctrl); - if (err == -EPROBE_DEFER) - goto err_out; - - dev_warn(&pdev->dev, "No pinctrl provided\n"); - } - err = -ENOMEM; dev = alloc_etherdev(sizeof(*bp)); if (!dev)