From patchwork Tue Sep 15 04:24:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 260872 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=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 7CB08C433E2 for ; Tue, 15 Sep 2020 04:25:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C25220771 for ; Tue, 15 Sep 2020 04:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600143926; bh=mXEIkAeWmof5ugfFnfVi6Fzy744+20FKyxI+6m3Vng8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XvfXOnweKBB4pKbzTI0iDOikia6K92p00tUiMnLER/tiIXa7LCxt9OFUxed0GEE1j 4uhsfmM7gIZqXcTezkw+EIDYtd8VguRbfsLj1al5VR3BeSdc3lVexV/g/A7Uj2yI7U ZaZwt4THKMFlx/06GpiMK9dIo8sn46XY6PdmFliQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726406AbgIOEZP (ORCPT ); Tue, 15 Sep 2020 00:25:15 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:46674 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726195AbgIOEZF (ORCPT ); Tue, 15 Sep 2020 00:25:05 -0400 Received: by mail-pg1-f196.google.com with SMTP id 34so1264778pgo.13; Mon, 14 Sep 2020 21:25:05 -0700 (PDT) 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=deF/Fb8nYOYqTWT29+DXa40R35LsuxAmpivI4tm7Tbc=; b=AXgb6zcO9yXIhAQ01mNLOARK8Gedfa1aQbgPmZVs3sl3fO6QYy6em2VStY183+rXVp x+H5ZJrHiz/5jCWuzH4x8v5XcICSmnq3hi97qC4zzU1mSTeBpunyjnKaeeE0xAysQg/z iRYppgXi2KoStm148ggT9OHjdGmKivF0NDGcT1Q7AdmDYak2i6cOotXiD0Lol/fXuhZt aaYuH7IkIOGM+4romyViMV7kdkUnruKBlZo8P+c9sFWLCxNyTgdWFbDMBK4zgRKvBOEi 1ZgQXfsPehyrIaMWnNzZbZowx7lFpzJ+3MSisH3bOthAkneJKEGFie6gEfXCpHA5ewPS 4qvA== X-Gm-Message-State: AOAM530Xx9yqwEQ0m0/5YM7fcljVfZYL7oOAyGeMM3Q7tMUzgkRFjDh7 n8heq0TKG8LJjr1l3AM0Dmk= X-Google-Smtp-Source: ABdhPJxSuO5fCxCjxpUwsmWROo4G6Nu+y4ib2eGNg5Zco6p9UQXh4QWcAs3VET3qPVlpjZetUoaxtg== X-Received: by 2002:a63:4625:: with SMTP id t37mr8263179pga.180.1600143905087; Mon, 14 Sep 2020 21:25:05 -0700 (PDT) Received: from localhost ([2601:647:5b00:1162:1ac0:17a6:4cc6:d1ef]) by smtp.gmail.com with ESMTPSA id r123sm12080741pfc.187.2020.09.14.21.25.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 21:25:04 -0700 (PDT) From: Moritz Fischer To: davem@davemloft.net Cc: snelson@pensando.io, mst@redhat.com, hkallweit1@gmail.com, netdev@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, moritzf@google.com, Moritz Fischer Subject: [PATCH net-next v2 1/3] net: dec: tulip: de2104x: Replace alloc_etherdev by devm_alloc_etherdev Date: Mon, 14 Sep 2020 21:24:50 -0700 Message-Id: <20200915042452.26155-2-mdf@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915042452.26155-1-mdf@kernel.org> References: <20200915042452.26155-1-mdf@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace devm_alloc_etherdev() with its devres version. Signed-off-by: Moritz Fischer --- drivers/net/ethernet/dec/tulip/de2104x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index 42b798a3fad4..9bcfc82b71d1 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c @@ -1986,7 +1986,7 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) #endif /* allocate a new ethernet device structure, and fill in defaults */ - dev = alloc_etherdev(sizeof(struct de_private)); + dev = devm_alloc_etherdev(&pdev->dev, sizeof(struct de_private)); if (!dev) return -ENOMEM; @@ -2011,7 +2011,7 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* wake up device, assign resources */ rc = pci_enable_device(pdev); if (rc) - goto err_out_free; + return rc; /* reserve PCI resources to ensure driver atomicity */ rc = pci_request_regions(pdev, DRV_NAME); @@ -2098,8 +2098,6 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_release_regions(pdev); err_out_disable: pci_disable_device(pdev); -err_out_free: - free_netdev(dev); return rc; } @@ -2114,7 +2112,6 @@ static void de_remove_one(struct pci_dev *pdev) iounmap(de->regs); pci_release_regions(pdev); pci_disable_device(pdev); - free_netdev(dev); } #ifdef CONFIG_PM From patchwork Tue Sep 15 04:24:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 260871 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=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 435E4C433E2 for ; Tue, 15 Sep 2020 04:25:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10D9B2078D for ; Tue, 15 Sep 2020 04:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600143944; bh=dis8z7pygsTC32X1Zvo+UQ7/Eb5uMSXDDtAdWYAzPUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cDZI5akyQHt31JEQa6ruOiBK5e1749rAwX6pi+gsZxbWt82mPCksLRNVK4nenTJ+u ga4Qx7wbAj12n37w7Z7VaBnseLVUhT9rDijHlk1shrwiLx/jJNDPdR+TiPeI1zbOS8 bw+FV+QhM+ud9IBCfa77qb91sMQpbplxgXxfh0NI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726359AbgIOEZe (ORCPT ); Tue, 15 Sep 2020 00:25:34 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44690 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726019AbgIOEZJ (ORCPT ); Tue, 15 Sep 2020 00:25:09 -0400 Received: by mail-pg1-f194.google.com with SMTP id 7so1275946pgm.11; Mon, 14 Sep 2020 21:25:07 -0700 (PDT) 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=HmHolgvrbuagVXTL4BA3meP6qEGQOiV1kQvj6Hedeks=; b=sqpJQojQW3NGFzOOC9jfLuAVA7bax6JCc9nnq9U7wpwY7k1jpBWhsnYNK33d9dNDK7 1r8D9kNjXHu5yRpeMMiTMafyeKokvXHZJ7z5921O7R+ROdQJGukTd98VYOIe/sGt3/gk Lla97Q4Igb53S/aEX09OR6dWuP9+nW5Bo/cTRCoPBzPAf4EAClVekwQw8KJVOQgnTQnv MBgwYg4iR9s0bxrQq2nYw58hP+j2mOx1GwqU/IZXmn/yF8JJIyUxQNUfv8DwcMhokYDE E0UM0TlWEPXNhDdpVk+04gB7suFrcFMxlFW99G+pjhFtlWi7syFKM4UgScntnQAEYYlm 1Mtg== X-Gm-Message-State: AOAM533ORC6+6tnlzw01XHZE9OHgNtZVZYnR9mjPCevyIv3jjPUoSts+ l8iZIg8oaeaQ/vSwNQxK/Sw= X-Google-Smtp-Source: ABdhPJzr5hqDtRuoKMCCbApHHYEm1y/ARC9VSbVQlQGag/jlbY/XJtHLKoQkBRu6c18iJtfx8kPKxA== X-Received: by 2002:aa7:9e4e:0:b029:13c:1611:6589 with SMTP id z14-20020aa79e4e0000b029013c16116589mr16397171pfq.6.1600143906302; Mon, 14 Sep 2020 21:25:06 -0700 (PDT) Received: from localhost ([2601:647:5b00:1162:1ac0:17a6:4cc6:d1ef]) by smtp.gmail.com with ESMTPSA id k4sm2172417pga.76.2020.09.14.21.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 21:25:05 -0700 (PDT) From: Moritz Fischer To: davem@davemloft.net Cc: snelson@pensando.io, mst@redhat.com, hkallweit1@gmail.com, netdev@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, moritzf@google.com, Moritz Fischer Subject: [PATCH net-next v2 2/3] net: dec: tulip: de2104x: Replace pci_enable_device with devres version Date: Mon, 14 Sep 2020 21:24:51 -0700 Message-Id: <20200915042452.26155-3-mdf@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915042452.26155-1-mdf@kernel.org> References: <20200915042452.26155-1-mdf@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace pci_enable_device() with its devres counterpart pcim_enable_device(). Signed-off-by: Moritz Fischer --- Note: Please check my logic on this, it would seem to me calling pci_disable_device() on devices enabled with pcim_enable_device() *should* be fine. Changes from v1: - Fixed missing replace for resume function --- drivers/net/ethernet/dec/tulip/de2104x.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index 9bcfc82b71d1..698d79bc4784 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c @@ -2009,14 +2009,14 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netif_carrier_off(dev); /* wake up device, assign resources */ - rc = pci_enable_device(pdev); + rc = pcim_enable_device(pdev); if (rc) return rc; /* reserve PCI resources to ensure driver atomicity */ rc = pci_request_regions(pdev, DRV_NAME); if (rc) - goto err_out_disable; + return rc; /* check for invalid IRQ value */ if (pdev->irq < 2) { @@ -2096,8 +2096,6 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) iounmap(regs); err_out_res: pci_release_regions(pdev); -err_out_disable: - pci_disable_device(pdev); return rc; } @@ -2111,7 +2109,6 @@ static void de_remove_one(struct pci_dev *pdev) kfree(de->ee_data); iounmap(de->regs); pci_release_regions(pdev); - pci_disable_device(pdev); } #ifdef CONFIG_PM @@ -2164,7 +2161,7 @@ static int de_resume (struct pci_dev *pdev) goto out; if (!netif_running(dev)) goto out_attach; - if ((retval = pci_enable_device(pdev))) { + if ((retval = pcim_enable_device(pdev))) { netdev_err(dev, "pci_enable_device failed in resume\n"); goto out; }