From patchwork Wed Mar 16 17:25:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Frias X-Patchwork-Id: 598576 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 3qQJtc3fFKz9t5T for ; Thu, 17 Mar 2016 04:50:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=laposte.net header.i=@laposte.net header.b=bGS1GGtN; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934859AbcCPRud (ORCPT ); Wed, 16 Mar 2016 13:50:33 -0400 Received: from smtpoutz28.laposte.net ([194.117.213.103]:52394 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933085AbcCPRuc (ORCPT ); Wed, 16 Mar 2016 13:50:32 -0400 X-Greylist: delayed 1469 seconds by postgrey-1.27 at vger.kernel.org; Wed, 16 Mar 2016 13:50:32 EDT Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout016 (Postfix) with ESMTP id 39337110D48 for ; Wed, 16 Mar 2016 18:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=laposte.net; s=mail1; t=1458149160; bh=9wHXfL9S5PJes+eYPim+p3kUCF5tAolz5RSK1imGpBY=; h=Date:From:To:CC:Subject; b=bGS1GGtNwlWUR4x8jN40MxBK58UWnEo0yUYMi8cY4T860lueejZgL0aTdfkKZoRGt XsVRXrlHi9IS41YEBE5qtccQ8mpnjucjnSR+Ss+aPkKEBfVu4qTEeU/uo+uncwAtoK MF4c5BxysdG4K5RSuCxXQr/52lSrpbv65XzDZd23TJ5ADh/bzlnvCCqopGPf46Zvl+ poInXMlY8OHz62274eAWc6pdc+jguqkxgUC5KMi15zmpSL5OmXCVoQylqnKCrOPKLq ikeRgdOgp0t9FosVBRV7ydknqdjHkWWOWMaN5iP5oSRgd1KUCxfdtISgjkpSSRXDFF 85+qJABvwkmmw== Received: from lpn-prd-vrin004 (lpn-prd-vrin004.laposte [10.128.63.5]) by lpn-prd-vrout016 (Postfix) with ESMTP id 360E4110D1B for ; Wed, 16 Mar 2016 18:26:00 +0100 (CET) Received: from lpn-prd-vrin004 (localhost [127.0.0.1]) by lpn-prd-vrin004 (Postfix) with ESMTP id 228E870E274 for ; Wed, 16 Mar 2016 18:26:00 +0100 (CET) Received: from [172.27.0.214] (ovpn12414.celeste.fr [83.142.147.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lpn-prd-vrin004 (Postfix) with ESMTPSA id 7E8B970E26F; Wed, 16 Mar 2016 18:25:59 +0100 (CET) Message-ID: <56E99727.9040702@laposte.net> Date: Wed, 16 Mar 2016 18:25:59 +0100 From: Sebastian Frias User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: =?UTF-8?B?VXdlIEtsZWluZS1Lw7ZuaWc=?= , "David S. Miller" , netdev@vger.kernel.org CC: lkml , mason Subject: [PATCH] net: phy: at803x: don't depend on GPIOLIB X-VR-SrcIP: 83.142.147.193 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeekkedrtddvgddutddtucetufdoteggodetrfdotffvucfrrhho X-VR-Cause-2: fhhilhgvmecunfetrffquffvgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhht X-VR-Cause-3: shculddquddttddmnecujfgurhepkfffhfgfggfvufgtgfesthejrgdttdefjeenucfhrhhomhepufgv X-VR-Cause-4: sggrshhtihgrnhcuhfhrihgrshcuoehsfhekgeeslhgrphhoshhtvgdrnhgvtheqnecukfhppeekfedr X-VR-Cause-5: udegvddrudegjedrudelfeenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopegludej X-VR-Cause-6: vddrvdejrddtrddvudegngdpihhnvghtpeekfedrudegvddrudegjedrudelfedpmhgrihhlfhhrohhm X-VR-Cause-7: pehsfhekgeeslhgrphhoshhtvgdrnhgvthdprhgtphhtthhopehurdhklhgvihhnvgdqkhhovghnihhg X-VR-Cause-8: sehpvghnghhuthhrohhnihigrdguvg X-VR-AvState: No X-VR-State: 0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 687908c2b649 ("net: phy: at803x: simplify using devm_gpiod_get_optional and its 4th argument") introduced a dependency on GPIOLIB that was not there before. This commit removes such dependency by checking the return code and comparing it against ENOSYS which is returned when GPIOLIB is not selected. Fixes: 687908c2b649 ("net: phy: at803x: simplify using devm_gpiod_get_optional and its 4th argument") Signed-off-by: Sebastian Frias --- drivers/net/phy/at803x.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 2174ec9..88b7ff3 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -252,7 +252,9 @@ static int at803x_probe(struct phy_device *phydev) return -ENOMEM; gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(gpiod_reset)) + if (PTR_ERR(gpiod_reset) == -ENOSYS) + gpiod_reset = NULL; + else if (IS_ERR(gpiod_reset)) return PTR_ERR(gpiod_reset); priv->gpiod_reset = gpiod_reset;