From patchwork Sun Oct 1 11:02:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820256 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FkjVylYY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j725dgvz9t2f for ; Sun, 1 Oct 2017 22:02:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751281AbdJALCS (ORCPT ); Sun, 1 Oct 2017 07:02:18 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35370 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751005AbdJALCP (ORCPT ); Sun, 1 Oct 2017 07:02:15 -0400 Received: by mail-wm0-f67.google.com with SMTP id b189so1874364wmd.2 for ; Sun, 01 Oct 2017 04:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w2shvzZ+50QHflkjbJliyKDfvnKUNYnWp2VTvE+0OrY=; b=FkjVylYY7T4sWx4ChQZvoy4x+jKl00EbxJsR+npvq+rfPMFDPchLCMIAPAkdrHpDpt FKcj78W722TRaMJ6B1I52Bj9D02FdOwBudu84Eqlt2MHGKzkfAj8WsZoY6idh+ehO/sN uevAvv3HSBbLtA7qcuVUlw3WTGa44P7/JtZiKZG6sdhltAI18C7KwF4O/hyjBVwStqB6 drmwi0pPkhdetx/9ZZm4+qfgIRbXQ5xgDzwg7egDs/PeouNP3d9FzMAiAIigpEoMsoW8 ldsdJxgKYuoRGlP3CS2BKZlUEb3Lh0iAGFah54V2eV0sEeCqu7Kw7QPrOLZJ0MrMrBGG kzMw== 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=w2shvzZ+50QHflkjbJliyKDfvnKUNYnWp2VTvE+0OrY=; b=XlrarlpOEC4nq5sa8Fy8sBQO6qAWOa/Be2/Xxt+3IpFjSQIG+pZ+Iqeu+NC1GaJxFJ ATljDNI3cDFA6U159E6oZH0ssyZF/noA1DdViBaYMMAB+MNKaFerh+G5wm3ZMRHuJ6mt OuQzA1MHngyFQHT1BQ90uzk6vTReyU8BwE0lgxOQjcRVHhugzXwKP44QHClOZnAjObKU 8HPMtLiTKD+r2esE1LCtE/p22rQuEVZf6Hs2QVZbCaMVKTZRVOD2HUseOepND2rk2isG ZA3YdVGVYZ6zuKwOnz9jLU1o6C8KMn/KKJKA2qKvj9saoa7Cpd/ZmoSkj07+wdXSG9id APyw== X-Gm-Message-State: AHPjjUg3VV4E5PXio4fPnaAwu8AV+6nxYkJyBscqWZVWdpafNoOr0r/m eEmbalD9ZSh1LmV+vVK0/9m7xw== X-Google-Smtp-Source: AOwi7QDvB3eiJPMWS1bSPqTqYKdE5QitQlWkwFcAfdacHHfy3Lk4GHBUMgC9lVZKvJ6fzMyUgRQotw== X-Received: by 10.80.181.59 with SMTP id y56mr16653301edd.140.1506855734254; Sun, 01 Oct 2017 04:02:14 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:13 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 3/6] bcm63xx_enet: do not rely on probe order Date: Sun, 1 Oct 2017 13:02:17 +0200 Message-Id: <20171001110220.27668-4-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not rely on the shared device being probed before the enet(sw) devices. This makes it easier to eventually move out the shared device as a dma controller driver (what it should be). Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index a1e1e12e187a..8caf6abab3a6 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1722,10 +1722,8 @@ static int bcm_enet_probe(struct platform_device *pdev) const char *clk_name; int i, ret; - /* stop if shared driver failed, assume driver->probe will be - * called in the same order we register devices (correct ?) */ if (!bcm_enet_shared_base[0]) - return -ENODEV; + return -EPROBE_DEFER; res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1); @@ -2696,11 +2694,8 @@ static int bcm_enetsw_probe(struct platform_device *pdev) struct resource *res_mem; int ret, irq_rx, irq_tx; - /* stop if shared driver failed, assume driver->probe will be - * called in the same order we register devices (correct ?) - */ if (!bcm_enet_shared_base[0]) - return -ENODEV; + return -EPROBE_DEFER; res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq_rx = platform_get_irq(pdev, 0);