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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 A6A99C43381 for ; Sat, 9 Mar 2019 05:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71455207E0 for ; Sat, 9 Mar 2019 05:15:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cofGLunI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726110AbfCIFPc (ORCPT ); Sat, 9 Mar 2019 00:15:32 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:40853 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725613AbfCIFPc (ORCPT ); Sat, 9 Mar 2019 00:15:32 -0500 Received: by mail-pg1-f193.google.com with SMTP id u9so15760568pgo.7 for ; Fri, 08 Mar 2019 21:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=vFbbOQ6lNLlTaSct2hjN9DziAVCIqrVm8gf4BEaFj6U=; b=cofGLunIBtTRAWQKfzq+vrsVXq82RRsIMMolVW4ifbkBbvvcCZOUVgfWct5IoN1Fys EINn8seCzOiUm7WYAkGrHkJYJb367+YnVf6lMjaXnAJlcFzI7dDRDsocItMeAxVPmrOp ZqBVQiCORfdPFA+ogYDT0M/Dkbu65d6c0lURtDe/ITlR7NQn4Pjw33dxIGI/bhmd9UXu 8b0mAKe/QVcz2AcebBN/JuV8MrTJzTUGTF7yp7cBuC8XYfSuvmk1ZyYydoJZP3GmPjk5 LBo5jQcj+LtzKIVIILpRhtmftkGKNG0kO7+Cf/TDAnlr69thruId/mxpTOVE8jr9UZKi LhMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=vFbbOQ6lNLlTaSct2hjN9DziAVCIqrVm8gf4BEaFj6U=; b=KQ5Ze97NKQTibEkOJv+oONAc9PXUL8/1O2lrCqZ3lKHxiqeAj44xFAurtEG8t4sS9v NVViC6mXnUARsXiFZt26+r6/C+IofM5tLybtoX4qP/ui7NNW7EkgptSmU1NSx6Ngpcqc EiB2gGxqP4+FArkAFS6bfGQzD+1Qkpd63dMumh0F6lqmVYEfUuQhtV4dfqlXqC9eR8hI q8CUAbnpfo6kc4M7zpV0pXNtwt6lZzQwp00Ro+s4jfgg2aaxfaeXnL+EIKmJ8fkiHsQU fW0B5Uryk4tOPCI2LOmRJNUaKFw4JrjHehxmeVM2DVUHtPqsTbmK1FkIo/+2E1Vi4iuJ Nwew== X-Gm-Message-State: APjAAAXwq1DlnHQfKHw3IrXZ1RldhjzbeC9MXLFcjaoJ8dT1BQ2nLCx3 E/6ZzcEApwSg/XYobLc32En8N8xH X-Google-Smtp-Source: APXvYqxDZOGIsjhYRK7JE8Yu/tBaPuhofXGmaEeY0/ouxsSPa2aV0Xhn9cyURoSsPLkyHFzfEsZduA== X-Received: by 2002:a62:e910:: with SMTP id j16mr22075657pfh.44.1552108530738; Fri, 08 Mar 2019 21:15:30 -0800 (PST) Received: from localhost.localdomain (astound-69-42-18-19.ca.astound.net. [69.42.18.19]) by smtp.gmail.com with ESMTPSA id q13sm11356778pgh.24.2019.03.08.21.15.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 21:15:30 -0800 (PST) From: Rosen Penev To: netdev@vger.kernel.org Subject: [PATCH] net: mvneta: Switch to using devm_alloc_etherdev_mqs Date: Fri, 8 Mar 2019 21:15:29 -0800 Message-Id: <20190309051529.23323-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It allows some of the code to be simplified. Tested on Turris Omnia. Signed-off-by: Rosen Penev --- drivers/net/ethernet/marvell/mvneta.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index ff275780040f..e73c3af4ea9b 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4457,15 +4457,14 @@ static int mvneta_probe(struct platform_device *pdev) int err; int cpu; - dev = alloc_etherdev_mqs(sizeof(struct mvneta_port), txq_number, rxq_number); + dev = devm_alloc_etherdev_mqs(&pdev->dev, sizeof(struct mvneta_port), + txq_number, rxq_number); if (!dev) return -ENOMEM; dev->irq = irq_of_parse_and_map(dn, 0); - if (dev->irq == 0) { - err = -EINVAL; - goto err_free_netdev; - } + if (dev->irq == 0) + return -EINVAL; phy_mode = of_get_phy_mode(dn); if (phy_mode < 0) { @@ -4686,9 +4685,6 @@ static int mvneta_probe(struct platform_device *pdev) phylink_destroy(pp->phylink); err_free_irq: irq_dispose_mapping(dev->irq); -err_free_netdev: - free_netdev(dev); - return err; } /* Device removal routine */ @@ -4704,7 +4700,6 @@ static int mvneta_remove(struct platform_device *pdev) free_percpu(pp->stats); irq_dispose_mapping(dev->irq); phylink_destroy(pp->phylink); - free_netdev(dev); if (pp->bm_priv) { mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id); -- 2.17.1