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=-8.9 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 B1612C10F03 for ; Tue, 23 Apr 2019 20:46:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 799E5217D9 for ; Tue, 23 Apr 2019 20:46:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kJyuSlk4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbfDWUqH (ORCPT ); Tue, 23 Apr 2019 16:46:07 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:38114 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726075AbfDWUqH (ORCPT ); Tue, 23 Apr 2019 16:46:07 -0400 Received: by mail-pl1-f195.google.com with SMTP id f36so8088404plb.5 for ; Tue, 23 Apr 2019 13:46:07 -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=yjQcj/dRt3dKixVygp6SmNNVjR1mlwcdNo2LsnJzsfE=; b=kJyuSlk4PJt12SdFf+zCDvu6n9sBOjMKxdxn0phdiCS9hnZiVW8mE0J++J00wR2s+h 6Y8VHrbjzVnQrdKuFO9PZZ55Nn4GjmJRkjD2LH8+fd3W/ka7IhRx0ovOTLG+vRzMTePY cdGATBwW+O7rrt8iHrXDJr2bvctVCKguC8y5WoN1fniGwh0ZNR+R72TiY/03XDwIp7df iuISbydltIOd3Rm84p/swfsw+TJzdePIWnBzdBfCcVSl9Cr6NyphzLsc+AEDa7DToq+4 yX6NPJQXvN43ZcIPUurdWQ2LVjKoyYVA5WeFyS1+RB6eBOrMW10vEjXQqkRPzr4+riz3 UP/A== 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=yjQcj/dRt3dKixVygp6SmNNVjR1mlwcdNo2LsnJzsfE=; b=pROGdjEMcmcwW55HizbltVe/crIgXMS1S39YRoHZNKS1UXo7rJD4GXHy162Zav6rqq K6OFL2oda7RXZb4cBIqaVMJ6nkWU5ni0ze+NlTXIdfsEt4uNKpQ6Ed2heS/pVcAlgZH4 nWBTMGyLZGunocYW2KWIOBCBc5TWqnkxuFEOcSepE+6YEsn3G5tpUbCloF4WocWxh7JU 8JB099CFT/yul7LMM08nnh1LG8z6nTvPkjd2ljS05umT61J7T34wNdRR+WR/aCo1h8h7 dd614I59PdoiIGJmM9ILUskfUCnpoU1xQd/PPUFwDr0gH+bjgSjxcmiohmb4y7XjRi5c Lwww== X-Gm-Message-State: APjAAAXZy8C48SqI93cm8tJrbmPSyi7XYQ1/zgCX3ONvfl5RxsF0wtIg xonvX2notnXqnML6lShK1Ck5bY52 X-Google-Smtp-Source: APXvYqwibipihGlP0Ssj025eOEC5RJNYsJLt5/oYt7zMnmEBzmLsFsay1an9uy4nEuVUDF9eKdqILw== X-Received: by 2002:a17:902:9341:: with SMTP id g1mr28752901plp.81.1556052366610; Tue, 23 Apr 2019 13:46:06 -0700 (PDT) Received: from mangix-pc.lan (76-14-106-140.rk.wavecable.com. [76.14.106.140]) by smtp.gmail.com with ESMTPSA id h15sm7473093pfr.146.2019.04.23.13.46.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 13:46:05 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Subject: [PATCH v2] net: mvneta: Switch to using devm_alloc_etherdev_mqs Date: Tue, 23 Apr 2019 13:46:03 -0700 Message-Id: <20190423204603.13350-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 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index bb68737dce56..a715277ecf81 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4476,15 +4476,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) { @@ -4705,8 +4704,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; } @@ -4723,7 +4720,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