From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 49BF2C433E0 for ; Wed, 20 May 2020 11:46:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 0369020657 for ; Wed, 20 May 2020 11:46:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BiOrS2KQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="R7zN8JmI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0369020657 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UeqcvIUtGEubs84lrzF2Uzfy3h/myTGjrw03wzr/8iE=; b=BiOrS2KQWRNTH5 QJw7emH0vBr3QuoFHGQ7HhwNG3Y7MqSgwwwJGAPSW4uq+bH+k4aS+Woj0WFspGwv+jEFKTByv812v BYnCDiaAW2sOB0tTaYO2Bl/Y8+uZ/b5UXgqNssWXf0TkXSevk70jbNPd3H5L2GqbBYJuAqOSjkVHG thm5jWpfdlZMDWT/1NgspBglNpZp2jnfr5l2Yw83Scb+mcHp26mLu/LkJrVLo3Qg8JJTOKqd4ln5t co7lH8spONSNHigZL12t+MYKsG2wTmyHfZky4kfTXJA9wTgDD7hMlUlA1S30pVv3f9LYovsMDcI2Q SGPsfYE0HWJOIm/GHpjA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbNB8-0008Cc-7Y; Wed, 20 May 2020 11:46:30 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbN9D-0004Ho-8u for linux-mediatek@lists.infradead.org; Wed, 20 May 2020 11:44:33 +0000 Received: by mail-wr1-x443.google.com with SMTP id e1so2816508wrt.5 for ; Wed, 20 May 2020 04:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YDvXJX4yV3p/HLngOBi/jKhO6RPUbYJQuBEN6OKUGtQ=; b=R7zN8JmITYNRLCw9ivuWeVAv4mugM84KU9YtOgLMG84n9N+ErPDlDOUXwmnnn6qAK0 viPGPNbxdWUJXG4FO2NefKDnqLl+ENkQThQY7F7pVJLW7vTVZ1SfT47impUX3qDOd2VQ uEkDA/gG3TYp0MSKvb6EO3pf49EGvtOXQXJigVQlnn4NsSR4ny5rZcBkqy8g6uUU53O5 M1yNyMEx4zclKGqRO8yeeGHcEX3Vt5PjHhwmyW0CwImOXcw/fAUlzgLkGY4MThV+pK2K h27XQSVc0pcPLN7VXSi/HBl9isXiwjvQ9x9/UtiIEgN+mxIitT8el5sMSp02Se1SEvP+ QHkA== 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:mime-version:content-transfer-encoding; bh=YDvXJX4yV3p/HLngOBi/jKhO6RPUbYJQuBEN6OKUGtQ=; b=NE49NZ9N8X0/jqoda0XijxYwREW5jN19FCt9q3DQvpUWnEqN5nd8ULN4WGlygXePLg j3MR+bIi+6u5RZpOIKTCvoMZalMufjGfwy2TUWoANBpB2qjueTvOrEBzH1RlRzhG+gXf bmKrXNrSrfBTMjm8eUUKKnKtnGptqZIXleNbHR0X1DFlBD3r8cEq3HlXoHld5rPXfl3V VSCc77kvqdDtTRb8xViAioyzuDVyLlzwHm2wWsq8ZeR8sN3bO+XdW7S7b6usF0hzZtJh GV4aqSTOYi1UZcYBtgvRwS+RgMLFQ4MMoBPWeF4tqbYsd0SNaxhkDSvMhJMtQehMK6pn 2n5Q== X-Gm-Message-State: AOAM530OTi6xabZM0kyn9NbzyyMsZsW+df3eSMl7Sudu0dpYr63f5/nr Bm7CDRC26nrBVmklYz+/vcnj4A== X-Google-Smtp-Source: ABdhPJxix/P9D3Mn5oh6fiWDRRTUhSOcXRz8XE3qxCx4RCTw666U9OaDVlR73p1lgKqZTh/IlvPteQ== X-Received: by 2002:a5d:60c3:: with SMTP id x3mr3697173wrt.48.1589975069582; Wed, 20 May 2020 04:44:29 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-65-232.w2-15.abo.wanadoo.fr. [2.15.156.232]) by smtp.gmail.com with ESMTPSA id q2sm2530782wrx.60.2020.05.20.04.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2020 04:44:29 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Corbet , "David S . Miller" , Matthias Brugger , John Crispin , Sean Wang , Mark Lee , Jakub Kicinski , Arnd Bergmann , Fabien Parent , Heiner Kallweit , Edwin Peer Subject: [PATCH 5/5] net: ethernet: mtk_eth_mac: use devm_register_netdev() Date: Wed, 20 May 2020 13:44:15 +0200 Message-Id: <20200520114415.13041-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200520114415.13041-1-brgl@bgdev.pl> References: <20200520114415.13041-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200520_044431_363051_4B4E47AD X-CRM114-Status: GOOD ( 12.16 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Stephane Le Provost , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , linux-mediatek@lists.infradead.org, Andrew Perepech , Pedro Tsai , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski Use the new devres variant of register_netdev() in the mtk-eth-mac driver and shrink the code by a couple lines. Signed-off-by: Bartosz Golaszewski --- drivers/net/ethernet/mediatek/mtk_eth_mac.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_mac.c b/drivers/net/ethernet/mediatek/mtk_eth_mac.c index 4dfe7c2c4e3d..2919ce27efeb 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_mac.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_mac.c @@ -1513,13 +1513,6 @@ static void mtk_mac_clk_disable_unprepare(void *data) clk_bulk_disable_unprepare(MTK_MAC_NCLKS, priv->clks); } -static void mtk_mac_unregister_netdev(void *data) -{ - struct net_device *ndev = data; - - unregister_netdev(ndev); -} - static int mtk_mac_probe(struct platform_device *pdev) { struct device_node *of_node; @@ -1631,15 +1624,7 @@ static int mtk_mac_probe(struct platform_device *pdev) netif_napi_add(ndev, &priv->napi, mtk_mac_poll, MTK_MAC_NAPI_WEIGHT); - ret = register_netdev(ndev); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, mtk_mac_unregister_netdev, ndev); - if (ret) - return ret; - - return 0; + return devm_register_netdev(dev, ndev); } static const struct of_device_id mtk_mac_of_match[] = { -- 2.25.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 BA8CEC433E0 for ; Wed, 20 May 2020 11:46:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 81FCF20657 for ; Wed, 20 May 2020 11:46:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HsixyLMM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="R7zN8JmI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81FCF20657 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=i35+R62kX004GE+H11k0jqi6VRI95gSOQp+GG4V1/XM=; b=HsixyLMMRxZz6b CKoHeVaAjqP6/yWVALidXq3WPxADOHA6TP6qhjIu6cpGyLagAWk30mJICchslgso2tgFvrK7aXmyk YVjUcHvt7aXCvYW10oqIg3Qz/2iUAr6zdk99faSAD7ZSqnwb9MfeNX7+84rnpETt97pf6a7XzDFrA jhPZIHghDynshcxJnXJOE8LI26N3kC8zdxMkBYG83Qu3G7+iNK0bBirNcGDSP4OlE7dYt8niKImIK F/JLLlr1KWgFvAMRZ04ZwhefgVREdDnbtFIEUrF+to4DWgfIba7yqG1qBcsX4o0Ud2bZVayVeQftO 9NQGcOQ2yT/BVBqNGJjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbNAt-0007wt-Tz; Wed, 20 May 2020 11:46:16 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jbN9D-0004Hq-36 for linux-arm-kernel@lists.infradead.org; Wed, 20 May 2020 11:44:33 +0000 Received: by mail-wr1-x444.google.com with SMTP id j5so2840348wrq.2 for ; Wed, 20 May 2020 04:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YDvXJX4yV3p/HLngOBi/jKhO6RPUbYJQuBEN6OKUGtQ=; b=R7zN8JmITYNRLCw9ivuWeVAv4mugM84KU9YtOgLMG84n9N+ErPDlDOUXwmnnn6qAK0 viPGPNbxdWUJXG4FO2NefKDnqLl+ENkQThQY7F7pVJLW7vTVZ1SfT47impUX3qDOd2VQ uEkDA/gG3TYp0MSKvb6EO3pf49EGvtOXQXJigVQlnn4NsSR4ny5rZcBkqy8g6uUU53O5 M1yNyMEx4zclKGqRO8yeeGHcEX3Vt5PjHhwmyW0CwImOXcw/fAUlzgLkGY4MThV+pK2K h27XQSVc0pcPLN7VXSi/HBl9isXiwjvQ9x9/UtiIEgN+mxIitT8el5sMSp02Se1SEvP+ QHkA== 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:mime-version:content-transfer-encoding; bh=YDvXJX4yV3p/HLngOBi/jKhO6RPUbYJQuBEN6OKUGtQ=; b=DN+Yt3LsUA/tS4rp13GVAqY2YTVqMouhzUANWbxKpkx07JhGgdzkyEdPFPxCMeXWGi 3NApih8lJKFcOfPmrqiFAbDHyqI13eZK3XJAMRN0t5ZAnc5kAg8l1v5zuwGUe/drFoIr uv7bYJbMQXfGxk3K5kTLHwnBHBBALhdUgGk7ZkYNizijrsXVohZgywzux8sbqOJinEmr MACzrdZbB9L8tSAIF6cVLzWOpX+Z9SyLW4Yk1Z0Q8ZQj/dCuZKJANxEJhx+ZpUt0q3IG AC4E3Z4Sb731woP2ndgmdSJ3BWRodT++VQfDuXemd9NN+PM4d6HOBp6pg/94NA/U88al dTsA== X-Gm-Message-State: AOAM533dZO3asQArjn02Meo8xjPBAGSTGMu04q+1yWCFKeRstIdnxz1C QLTVQ+3ngbFMotndCq5DK71RSw== X-Google-Smtp-Source: ABdhPJxix/P9D3Mn5oh6fiWDRRTUhSOcXRz8XE3qxCx4RCTw666U9OaDVlR73p1lgKqZTh/IlvPteQ== X-Received: by 2002:a5d:60c3:: with SMTP id x3mr3697173wrt.48.1589975069582; Wed, 20 May 2020 04:44:29 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-65-232.w2-15.abo.wanadoo.fr. [2.15.156.232]) by smtp.gmail.com with ESMTPSA id q2sm2530782wrx.60.2020.05.20.04.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2020 04:44:29 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Corbet , "David S . Miller" , Matthias Brugger , John Crispin , Sean Wang , Mark Lee , Jakub Kicinski , Arnd Bergmann , Fabien Parent , Heiner Kallweit , Edwin Peer Subject: [PATCH 5/5] net: ethernet: mtk_eth_mac: use devm_register_netdev() Date: Wed, 20 May 2020 13:44:15 +0200 Message-Id: <20200520114415.13041-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200520114415.13041-1-brgl@bgdev.pl> References: <20200520114415.13041-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200520_044431_157813_2EC26142 X-CRM114-Status: GOOD ( 13.62 ) 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: devicetree@vger.kernel.org, Stephane Le Provost , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , linux-mediatek@lists.infradead.org, Andrew Perepech , Pedro Tsai , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski Use the new devres variant of register_netdev() in the mtk-eth-mac driver and shrink the code by a couple lines. Signed-off-by: Bartosz Golaszewski --- drivers/net/ethernet/mediatek/mtk_eth_mac.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_mac.c b/drivers/net/ethernet/mediatek/mtk_eth_mac.c index 4dfe7c2c4e3d..2919ce27efeb 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_mac.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_mac.c @@ -1513,13 +1513,6 @@ static void mtk_mac_clk_disable_unprepare(void *data) clk_bulk_disable_unprepare(MTK_MAC_NCLKS, priv->clks); } -static void mtk_mac_unregister_netdev(void *data) -{ - struct net_device *ndev = data; - - unregister_netdev(ndev); -} - static int mtk_mac_probe(struct platform_device *pdev) { struct device_node *of_node; @@ -1631,15 +1624,7 @@ static int mtk_mac_probe(struct platform_device *pdev) netif_napi_add(ndev, &priv->napi, mtk_mac_poll, MTK_MAC_NAPI_WEIGHT); - ret = register_netdev(ndev); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, mtk_mac_unregister_netdev, ndev); - if (ret) - return ret; - - return 0; + return devm_register_netdev(dev, ndev); } static const struct of_device_id mtk_mac_of_match[] = { -- 2.25.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 09496C433DF for ; Wed, 20 May 2020 11:44:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D80BF204EA for ; Wed, 20 May 2020 11:44:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="R7zN8JmI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726435AbgETLoh (ORCPT ); Wed, 20 May 2020 07:44:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727020AbgETLob (ORCPT ); Wed, 20 May 2020 07:44:31 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C892BC05BD43 for ; Wed, 20 May 2020 04:44:30 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id g12so1614185wrw.1 for ; Wed, 20 May 2020 04:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YDvXJX4yV3p/HLngOBi/jKhO6RPUbYJQuBEN6OKUGtQ=; b=R7zN8JmITYNRLCw9ivuWeVAv4mugM84KU9YtOgLMG84n9N+ErPDlDOUXwmnnn6qAK0 viPGPNbxdWUJXG4FO2NefKDnqLl+ENkQThQY7F7pVJLW7vTVZ1SfT47impUX3qDOd2VQ uEkDA/gG3TYp0MSKvb6EO3pf49EGvtOXQXJigVQlnn4NsSR4ny5rZcBkqy8g6uUU53O5 M1yNyMEx4zclKGqRO8yeeGHcEX3Vt5PjHhwmyW0CwImOXcw/fAUlzgLkGY4MThV+pK2K h27XQSVc0pcPLN7VXSi/HBl9isXiwjvQ9x9/UtiIEgN+mxIitT8el5sMSp02Se1SEvP+ QHkA== 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:mime-version:content-transfer-encoding; bh=YDvXJX4yV3p/HLngOBi/jKhO6RPUbYJQuBEN6OKUGtQ=; b=FYCTapReW1F5V3ZqDbunyHRziK6bwAM5DQTGYl4SAaRvO3I91keQ2FzP2KQVrZZDox Gk3tv5RqPWcRdqbIHcN8TYRBzhunuXONtG2OP/7ts9YnwoLU1MJLYSrD18yfWPnK+6ty 8kYttDR3MfdcxTCF0+/ZBDswJoV9Jjn30/PUaqUQ0hPHDO4MlUL8oLWw8BAjrT58kbvh VdpeF1awCFyuNllw0CHpVPjbuZgMZGpk4mtmcyTvY2CzllrQG+IhdYLvtASsquzSbI/Y iSUm91gxFNoSiNi1kY7A4+pHkOH4/4WU2NdAavxFVKDoIzxRFO6+NdrykFKFOHzqEz2/ CB1g== X-Gm-Message-State: AOAM530QbSmdsnjAoxvcthjX2OSPoCn9aawZJh8ZZNr1k9mXpdggcI74 v7MOcjGBePyfuo56u9xn0lmqsg== X-Google-Smtp-Source: ABdhPJxix/P9D3Mn5oh6fiWDRRTUhSOcXRz8XE3qxCx4RCTw666U9OaDVlR73p1lgKqZTh/IlvPteQ== X-Received: by 2002:a5d:60c3:: with SMTP id x3mr3697173wrt.48.1589975069582; Wed, 20 May 2020 04:44:29 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-65-232.w2-15.abo.wanadoo.fr. [2.15.156.232]) by smtp.gmail.com with ESMTPSA id q2sm2530782wrx.60.2020.05.20.04.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2020 04:44:29 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Corbet , "David S . Miller" , Matthias Brugger , John Crispin , Sean Wang , Mark Lee , Jakub Kicinski , Arnd Bergmann , Fabien Parent , Heiner Kallweit , Edwin Peer Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Stephane Le Provost , Pedro Tsai , Andrew Perepech , Bartosz Golaszewski Subject: [PATCH 5/5] net: ethernet: mtk_eth_mac: use devm_register_netdev() Date: Wed, 20 May 2020 13:44:15 +0200 Message-Id: <20200520114415.13041-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200520114415.13041-1-brgl@bgdev.pl> References: <20200520114415.13041-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Bartosz Golaszewski Use the new devres variant of register_netdev() in the mtk-eth-mac driver and shrink the code by a couple lines. Signed-off-by: Bartosz Golaszewski --- drivers/net/ethernet/mediatek/mtk_eth_mac.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_mac.c b/drivers/net/ethernet/mediatek/mtk_eth_mac.c index 4dfe7c2c4e3d..2919ce27efeb 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_mac.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_mac.c @@ -1513,13 +1513,6 @@ static void mtk_mac_clk_disable_unprepare(void *data) clk_bulk_disable_unprepare(MTK_MAC_NCLKS, priv->clks); } -static void mtk_mac_unregister_netdev(void *data) -{ - struct net_device *ndev = data; - - unregister_netdev(ndev); -} - static int mtk_mac_probe(struct platform_device *pdev) { struct device_node *of_node; @@ -1631,15 +1624,7 @@ static int mtk_mac_probe(struct platform_device *pdev) netif_napi_add(ndev, &priv->napi, mtk_mac_poll, MTK_MAC_NAPI_WEIGHT); - ret = register_netdev(ndev); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, mtk_mac_unregister_netdev, ndev); - if (ret) - return ret; - - return 0; + return devm_register_netdev(dev, ndev); } static const struct of_device_id mtk_mac_of_match[] = { -- 2.25.0