From patchwork Tue Mar 19 20:53:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1058670 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Qs5RWXzn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44P4yy0hxkz9s55 for ; Wed, 20 Mar 2019 07:53:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbfCSUxn (ORCPT ); Tue, 19 Mar 2019 16:53:43 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45060 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726712AbfCSUxn (ORCPT ); Tue, 19 Mar 2019 16:53:43 -0400 Received: by mail-pg1-f194.google.com with SMTP id y3so17112pgk.12 for ; Tue, 19 Mar 2019 13:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Tn3xNsTL0Z5Pw1xOhoL2Iu7HSB/dsQTkYcTiQpugcMQ=; b=Qs5RWXznxEDKxZZ8VJu5FBC/yvNP1uG5Lb5bmCHSHgQc3N3G0JPcjYPp2xlleH3Rck SOaQBb0HYWVEMGC5Jm+cBoAMxvCVeUiTA6sTgiLWjFlSmtqFOyo8XlYXUQRvq8yh3kwH tNoXNl8LI0SFwtvYX995uEar2GUeeKz3S6PJc7P0tCGs1UiQTarsG4rkhVxA1hkksFYF 1CvWgdBO8wTho5RL8lAkeHS/2ogA75fV+ZIt5PPq5URY6hb85aaBeTeGVWW/3HBBx7L4 XugOE0UmdpV+LFsHaUGZVtsyLPEKLBBA76tgSDNYn7VX2A+yfjkYvY+oD7mSa4xHBZmU l5Dg== 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=Tn3xNsTL0Z5Pw1xOhoL2Iu7HSB/dsQTkYcTiQpugcMQ=; b=Psoqn24yqY8CM7ZJYDTu7BfaNt5O2ghLfH51/2VImSNZcwduJvqkylgkQqDiMI0mm9 7+pCRTUX6uRrmC/cyHu98TKp/K3O4nYJ7U8DfPk9xaGdf/wqMTYwbvpElMF+v9pfTZjN 13HrdSl469uXeH7v1bE3Bny4kwk5BJkVRBeBVY2HGBtAmrfXGvJNITUieoaS8uDEh6Gq Fiu+0vDdTQ0effzCsGWhAjBlfvV4N3bYSIudiy4heMhg2jtGMcM8Zu6nM+QemU2ik6lO gTW2EiPLT23wMhX81szU48k4YrCrzVQFi73zuOVjLLqzM6WLHTSjgoJf3Yr5UjtgLg7G 9Sug== X-Gm-Message-State: APjAAAXXNfv/YMmP2beh9gTClW5h0qZfV6Qw1TMa9tJjTU+TWOnowcLd 0tDqdIQqhsiGSgUV+uU+F64R+MfG X-Google-Smtp-Source: APXvYqwVt0c+OtjMavW2qj+1gUpkeYqRWapKWk2ndAz5KS900FXmljjd/Kbp3M7rIKoRB/JNbdOu9Q== X-Received: by 2002:a63:f853:: with SMTP id v19mr25050850pgj.391.1553028822686; Tue, 19 Mar 2019 13:53:42 -0700 (PDT) Received: from mangix-pc.lan (astound-69-42-18-19.ca.astound.net. [69.42.18.19]) by smtp.gmail.com with ESMTPSA id v4sm19829482pff.181.2019.03.19.13.53.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 13:53:41 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Subject: [PATCH] net: mvneta: Switch to using devm_alloc_etherdev_mqs Date: Tue, 19 Mar 2019 13:53:40 -0700 Message-Id: <20190319205340.27880-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. 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 a78a39244b79..8376ee12ef10 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4422,15 +4422,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) { @@ -4641,9 +4640,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 */ @@ -4659,7 +4655,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);