From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756120AbbCGAK6 (ORCPT ); Fri, 6 Mar 2015 19:10:58 -0500 Received: from mail-by2on0097.outbound.protection.outlook.com ([207.46.100.97]:47798 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751467AbbCGAK5 (ORCPT ); Fri, 6 Mar 2015 19:10:57 -0500 From: To: CC: , , , Dinh Nguyen , Vince Bridgers , "David S. Miller" Subject: [PATCHv2 net-next] net: stmmac: make reset control an optional requirement Date: Fri, 6 Mar 2015 17:48:28 -0600 Message-ID: <1425685708-12600-1-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR08CA0047.namprd08.prod.outlook.com (10.141.200.27) To BN3PR0301MB1185.namprd03.prod.outlook.com (25.160.156.147) Authentication-Results: st.com; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1185; X-Forefront-Antispam-Report: BMV:1;SFV:NSPM;SFS:(10009020)(6009001)(50466002)(48376002)(87976001)(40100003)(19580395003)(19580405001)(92566002)(86152002)(86362001)(122386002)(50226001)(62966003)(77156002)(50986999)(2351001)(229853001)(110136001)(33646002)(47776003)(66066001)(42186005)(53416004)(46102003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR0301MB1185;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5002008)(5005006);SRVR:BN3PR0301MB1185;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1185; X-Forefront-PRVS: 05079D8470 X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2015 23:54:57.9148 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1185 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinh Nguyen Not having a reset control line to the ethernet controller should not be a hard failure. Instead, add support for deferred probing and just print out a debug statement. Signed-off-by: Dinh Nguyen Cc: Vince Bridgers CC: David S. Miller --- v2: return EPROBE_DEFER directly as 'ret' is not used as return variable --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index 3aad413..9987b34 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -89,7 +89,9 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device * STMMAC_RESOURCE_NAME); if (IS_ERR(dwmac->stmmac_rst)) { dev_info(dev, "Could not get reset control!\n"); - return -EINVAL; + if (PTR_ERR(dwmac->stmmac_rst) == -EPROBE_DEFER) + return -EPROBE_DEFER; + dwmac->stmmac_rst = NULL; } dwmac->interface = of_get_phy_mode(np); -- 2.2.1