From patchwork Mon Nov 9 08:05:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 11890579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F89FC4741F for ; Mon, 9 Nov 2020 08:06:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22DDE20853 for ; Mon, 9 Nov 2020 08:06:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZXfMLRqO"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="ZgRxtAGE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22DDE20853 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=synaptics.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Z38Bqmh+Ux4hpfLYs3q4g9bso+s8pDOSbdR541ph8Z4=; b=ZXfMLRqORx5pk23Vs1aSTpmiaH ArjpZZqR4GsBi/aJ0dgizKa7eoGhs5dSGJFhmxomU0IERSnaJ0Ue1iQDmFEelhJIxINT47sape2gn Ug9dcOfp3Wxqa+MhVifmWwLpfsHjpkx7hSna/YXZBca1u5jwPFL3l42LDXWQiXjVq52gcsQ7iMbH/ IDnSYfojzfjhw15aVYAMSpuHuKImUxoRtByCO8gVGEoRoT99Y1E2W5JJQVW4mlRCqiQj2AR2QUMQB p1C4ayDkXuygNUmQ1zch9IVcrWEj4BUDtN+qe+m2gBiOL1xp0cw8tk+luXMu+G0e69smu0Yzywbfg qUrj1B1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc2BA-0003xZ-Cb; Mon, 09 Nov 2020 08:05:32 +0000 Received: from mail-eopbgr680088.outbound.protection.outlook.com ([40.107.68.88] helo=NAM04-BN3-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc2B7-0003wx-WB for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 08:05:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VxRnT2Z6VeA7gKyrKIayDLna6nUZKHYfh7Nml15mr0vCHdIlCt+FVXNpJVLOEYInUJ7fmAgiczWJvQI7hm+qCFV7DbTiLmE+hbZn4r0G1nBHhnnSSufiEV3e+7Ev2CLB+ogPZKnLcMUR3MdnXsmXhw8qBsUe5Qo9UCQQ9KnbLumQwp5MKbWKriFRxnfszqE7MBdNaZZFFH6UEmGd6IW5AsldLxXuVpUHj2gri3Il1GMtUfdI4p7l5ehv2Ugv3HZ9K3t6R3/Ff6uD5bern2rHAUk2enSBpkPQ6bQL6YrNl8sVFNLU3KRsOHHAt9p8g/HekjugcfzAmIaEgkDSKNhaRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cVzYQ7WyKGSlenh/Imy5VDY/ypXBBeSCNPH66uNYmXg=; b=DJhXIkckadqX+YGqP8j4HG/QrTNxrkiLQMLZWZoA3btbzvXR0eDCsam9luopym0NeGYtiZ/ixBsPhLa5j1BWZKjwAUMq9cn678keVg4LQRdHD8jBFa+KevcnRSV+Pu7wrKc6y/qvC/5zV4gEtGRaUomEpY1smcMxoXp64gOWLbSvSC7/+8NfBKemzYstSnVWDroCarVQRShdJqHGRaO15PbqoooKcn1B3m2Y1b9rnAyu5kzvplBEtcSLo+3dJ9yEODv2D/oi5eHyYb6j072lzIv8Pd7UiZvft8Bs2TzFcub+BZ5/SfT810q5xs2hnecD2jB7RVLLfmJaOU88qJ8n+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=synaptics.com; dmarc=pass action=none header.from=synaptics.com; dkim=pass header.d=synaptics.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector2-Synaptics-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cVzYQ7WyKGSlenh/Imy5VDY/ypXBBeSCNPH66uNYmXg=; b=ZgRxtAGE44Fi27QHyl0GvW/XGru1k9cqwbr0t5Vpif8gtjVoTW28XDCSqJgYSX7TDRoDDLYrcDaCPbZtgzYXedI1RnXR9fwF6BWNBeHTao3KRZriTojCT6Ira2yGg1wCjRz78Au6BNFFkql/S5Qvo/3k+eKJ3Ve+mfePMQ+BD8s= Authentication-Results: st.com; dkim=none (message not signed) header.d=none;st.com; dmarc=none action=none header.from=synaptics.com; Received: from SN2PR03MB2383.namprd03.prod.outlook.com (2603:10b6:804:d::23) by SN6PR03MB3616.namprd03.prod.outlook.com (2603:10b6:805:4b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.28; Mon, 9 Nov 2020 08:05:27 +0000 Received: from SN2PR03MB2383.namprd03.prod.outlook.com ([fe80::49be:5ea3:8961:a22]) by SN2PR03MB2383.namprd03.prod.outlook.com ([fe80::49be:5ea3:8961:a22%6]) with mapi id 15.20.3541.024; Mon, 9 Nov 2020 08:05:26 +0000 Date: Mon, 9 Nov 2020 16:05:14 +0800 From: Jisheng Zhang To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Maxime Coquelin Subject: [PATCH net-next] net: stmmac: dwc-qos: Change the dwc_eth_dwmac_data's .probe prototype Message-ID: <20201109160440.3a736ee3@xhacker.debian> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) X-Originating-IP: [192.147.44.204] X-ClientProxiedBy: BYAPR05CA0087.namprd05.prod.outlook.com (2603:10b6:a03:e0::28) To SN2PR03MB2383.namprd03.prod.outlook.com (2603:10b6:804:d::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from xhacker.debian (192.147.44.204) by BYAPR05CA0087.namprd05.prod.outlook.com (2603:10b6:a03:e0::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.10 via Frontend Transport; Mon, 9 Nov 2020 08:05:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2a3eeff-be34-455f-e74c-08d884863798 X-MS-TrafficTypeDiagnostic: SN6PR03MB3616: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7V8NvBFgJeVE3PQWyLHMDDbEXf0oswbmpCq+fC6LgUDtl/9VSsDJ71h/AFmOFND+N9Ft3tRmPt4CHlsRtAsLRJOimY4OPRuMg+SS652bs9MtN/X0evBcZZ+2f9gO2103aY8LmgAgkRPRvt99mQuSu7PIsoc5cXj8GgIzBYf8Oaq3uxrxdjVw1VCKHsqYfK9J847/wdhYVvZds4cuu70wmodwDatdKXdh003LKtrG9E7x8DTUi0nXN4LaEVUiItliIRs1QsJEDvgQSUnCyCcie0vnyu6ibMxvANunrK+n/FSy1mjRBfpWoWASjAnZUWP86DcaqM/iEzLIk9xsk36Q7JHldHw5gPz2OKP6LiXBilVURIlCnCr5GHXWTQI8TlUl X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN2PR03MB2383.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(39850400004)(346002)(136003)(376002)(66476007)(66946007)(9686003)(66556008)(2906002)(8936002)(8676002)(55016002)(478600001)(956004)(6666004)(7696005)(110136005)(83380400001)(5660300002)(4326008)(16526019)(6506007)(86362001)(186003)(1076003)(316002)(52116002)(26005)(7416002)(142923001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: h3V3TCL0vQAz+iTikWE6U4Q3wOR8hwaJlcwyzxTIJQNihnLHfniYXZhjvQxYyliBFXsHpYO1xNRYgVAP15j8v3ZLXTgHi+xJeD4a8nt0jMq55oWsBknCXUB5UQQ3TEAElsVOGERLEeFfNvWKgwHWWMXUnBC1SUQF8dXjgOLfm8t3DTbVBLijIFktHSLFogE43up9roKiwrtzYPTYwz0kPj2347PcdEYs7DirF8bRzZTXf0Vryt8Kuw1u4Sc+a9pvym7bt59/yaURO2PWxNVzvOMXmj7xSidno30aFAO5fL+w6d42FK2UfUaaF0ukDpvo4yWPQ1Ny8+RTIKVVwNa+1bqYOOZaEHrwP+vwwPHSchj0a43y0Ne+yE0kfEvPbQWx11nJBHs2WeHgGKW0MxepH8AJu8pNYfAC/neQ5mnxqPaLP7n49jvWPcGdESAD1E+8kXAI4nzzZKFY31LGdG6M1+Gl6kG+YSeuCo+SfvvoAdtLdVx9wMORMzrFgMFAY7fbKV94BBURdUp1/7UH0HRv+AouZ3VKGxd5LeeacvFRwR5Lsb4eRcvIaJpxbO/S78HNv0sbHT51bJEH/Gsx+m+g1Q9DPCqfXwOO7hP36y/6wC5H+jlOBCe/D7XkNDtQv+yrDP+r/EODuhN3V5yq01tqNQ== X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2a3eeff-be34-455f-e74c-08d884863798 X-MS-Exchange-CrossTenant-AuthSource: SN2PR03MB2383.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2020 08:05:26.8275 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: npxpU02FLEjidXha2j5SWeUYdhvelJPs6JnYNSgPO/OQnil8GB3B05XMwNubqC+TBgaJ1e0Nbo/S2uZ5pzuSlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB3616 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_030530_167994_1D418611 X-CRM114-Status: GOOD ( 16.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The return pointer of dwc_eth_dwmac_data's .probe isn't used, and "probe" usually return int, so change the prototype to follow standard way. Secondly, it can simplify the tegra_eqos_probe() code. Signed-off-by: Jisheng Zhang --- .../stmicro/stmmac/dwmac-dwc-qos-eth.c | 46 ++++++++----------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c index 2342d497348e..27254b27d7ed 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c @@ -119,23 +119,23 @@ static int dwc_eth_dwmac_config_dt(struct platform_device *pdev, return 0; } -static void *dwc_qos_probe(struct platform_device *pdev, - struct plat_stmmacenet_data *plat_dat, - struct stmmac_resources *stmmac_res) +static int dwc_qos_probe(struct platform_device *pdev, + struct plat_stmmacenet_data *plat_dat, + struct stmmac_resources *stmmac_res) { int err; plat_dat->stmmac_clk = devm_clk_get(&pdev->dev, "apb_pclk"); if (IS_ERR(plat_dat->stmmac_clk)) { dev_err(&pdev->dev, "apb_pclk clock not found.\n"); - return ERR_CAST(plat_dat->stmmac_clk); + return PTR_ERR(plat_dat->stmmac_clk); } err = clk_prepare_enable(plat_dat->stmmac_clk); if (err < 0) { dev_err(&pdev->dev, "failed to enable apb_pclk clock: %d\n", err); - return ERR_PTR(err); + return err; } plat_dat->pclk = devm_clk_get(&pdev->dev, "phy_ref_clk"); @@ -152,11 +152,11 @@ static void *dwc_qos_probe(struct platform_device *pdev, goto disable; } - return NULL; + return 0; disable: clk_disable_unprepare(plat_dat->stmmac_clk); - return ERR_PTR(err); + return err; } static int dwc_qos_remove(struct platform_device *pdev) @@ -267,19 +267,17 @@ static int tegra_eqos_init(struct platform_device *pdev, void *priv) return 0; } -static void *tegra_eqos_probe(struct platform_device *pdev, - struct plat_stmmacenet_data *data, - struct stmmac_resources *res) +static int tegra_eqos_probe(struct platform_device *pdev, + struct plat_stmmacenet_data *data, + struct stmmac_resources *res) { struct device *dev = &pdev->dev; struct tegra_eqos *eqos; int err; eqos = devm_kzalloc(&pdev->dev, sizeof(*eqos), GFP_KERNEL); - if (!eqos) { - err = -ENOMEM; - goto error; - } + if (!eqos) + return -ENOMEM; eqos->dev = &pdev->dev; eqos->regs = res->addr; @@ -368,9 +366,7 @@ static void *tegra_eqos_probe(struct platform_device *pdev, if (err < 0) goto reset; -out: - return eqos; - + return 0; reset: reset_control_assert(eqos->rst); reset_phy: @@ -384,8 +380,7 @@ static void *tegra_eqos_probe(struct platform_device *pdev, disable_master: clk_disable_unprepare(eqos->clk_master); error: - eqos = ERR_PTR(err); - goto out; + return err; } static int tegra_eqos_remove(struct platform_device *pdev) @@ -403,9 +398,9 @@ static int tegra_eqos_remove(struct platform_device *pdev) } struct dwc_eth_dwmac_data { - void *(*probe)(struct platform_device *pdev, - struct plat_stmmacenet_data *data, - struct stmmac_resources *res); + int (*probe)(struct platform_device *pdev, + struct plat_stmmacenet_data *data, + struct stmmac_resources *res); int (*remove)(struct platform_device *pdev); }; @@ -424,7 +419,6 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) const struct dwc_eth_dwmac_data *data; struct plat_stmmacenet_data *plat_dat; struct stmmac_resources stmmac_res; - void *priv; int ret; data = device_get_match_data(&pdev->dev); @@ -448,10 +442,8 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) if (IS_ERR(plat_dat)) return PTR_ERR(plat_dat); - priv = data->probe(pdev, plat_dat, &stmmac_res); - if (IS_ERR(priv)) { - ret = PTR_ERR(priv); - + ret = data->probe(pdev, plat_dat, &stmmac_res); + if (ret < 0) { if (ret != -EPROBE_DEFER) dev_err(&pdev->dev, "failed to probe subdriver: %d\n", ret);