All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <jthumshirn@suse.de>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johannes Thumshirn <jthumshirn@suse.de>,
	Frank Haverkamp <haver@linux.vnet.ibm.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 4/5] GenWQE: Use pci_(request|release)_mem_regions
Date: Tue, 31 May 2016 14:05:12 +0200	[thread overview]
Message-ID: <ceba6b07c133813ff6656d8876751a7e6244b05a.1464694724.git.jthumshirn@suse.de> (raw)
In-Reply-To: <cover.1464694724.git.jthumshirn@suse.de>
In-Reply-To: <cover.1464694724.git.jthumshirn@suse.de>

Now that we do have pci_request_mem_regions() and pci_release_mem_regions() at
hand, use it in the genwqe driver.

Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Frank Haverkamp <haver@linux.vnet.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/misc/genwqe/card_base.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c
index 4cf8f82..cb398be 100644
--- a/drivers/misc/genwqe/card_base.c
+++ b/drivers/misc/genwqe/card_base.c
@@ -182,7 +182,7 @@ static void genwqe_dev_free(struct genwqe_dev *cd)
  */
 static int genwqe_bus_reset(struct genwqe_dev *cd)
 {
-	int bars, rc = 0;
+	int rc = 0;
 	struct pci_dev *pci_dev = cd->pci_dev;
 	void __iomem *mmio;
 
@@ -193,8 +193,7 @@ static int genwqe_bus_reset(struct genwqe_dev *cd)
 	cd->mmio = NULL;
 	pci_iounmap(pci_dev, mmio);
 
-	bars = pci_select_bars(pci_dev, IORESOURCE_MEM);
-	pci_release_selected_regions(pci_dev, bars);
+	pci_release_mem_regions(pci_dev);
 
 	/*
 	 * Firmware/BIOS might change memory mapping during bus reset.
@@ -218,7 +217,7 @@ static int genwqe_bus_reset(struct genwqe_dev *cd)
 			    GENWQE_INJECT_GFIR_FATAL |
 			    GENWQE_INJECT_GFIR_INFO);
 
-	rc = pci_request_selected_regions(pci_dev, bars, genwqe_driver_name);
+	rc = pci_request_mem_regions(pci_dev, genwqe_driver_name);
 	if (rc) {
 		dev_err(&pci_dev->dev,
 			"[%s] err: request bars failed (%d)\n", __func__, rc);
@@ -1071,7 +1070,6 @@ static int genwqe_pci_setup(struct genwqe_dev *cd)
 	int err, bars;
 	struct pci_dev *pci_dev = cd->pci_dev;
 
-	bars = pci_select_bars(pci_dev, IORESOURCE_MEM);
 	err = pci_enable_device_mem(pci_dev);
 	if (err) {
 		dev_err(&pci_dev->dev,
@@ -1080,7 +1078,7 @@ static int genwqe_pci_setup(struct genwqe_dev *cd)
 	}
 
 	/* Reserve PCI I/O and memory resources */
-	err = pci_request_selected_regions(pci_dev, bars, genwqe_driver_name);
+	err = pci_request_mem_regions(pci_dev, genwqe_driver_name);
 	if (err) {
 		dev_err(&pci_dev->dev,
 			"[%s] err: request bars failed (%d)\n", __func__, err);
@@ -1160,8 +1158,7 @@ static void genwqe_pci_remove(struct genwqe_dev *cd)
 	if (cd->mmio)
 		pci_iounmap(pci_dev, cd->mmio);
 
-	bars = pci_select_bars(pci_dev, IORESOURCE_MEM);
-	pci_release_selected_regions(pci_dev, bars);
+	pci_release_mem_regions(pci_dev);
 	pci_disable_device(pci_dev);
 }
 
-- 
1.8.5.6

  parent reply	other threads:[~2016-05-31 12:05 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-31 12:05 [PATCH 0/5] Introduce pci_(request|release)_(mem|io)_regions Johannes Thumshirn
2016-05-31 12:05 ` [Intel-wired-lan] " Johannes Thumshirn
2016-05-31 12:05 ` Johannes Thumshirn
2016-05-31 12:05 ` [PATCH 1/5] PCI: Add helpers to request/release memory and I/O regions Johannes Thumshirn
2016-06-01  7:57   ` Christoph Hellwig
2016-05-31 12:05 ` [PATCH 2/5] NVMe: Use pci_(request|release)_mem_regions Johannes Thumshirn
2016-05-31 12:05   ` Johannes Thumshirn
2016-06-01  7:58   ` Christoph Hellwig
2016-06-01  7:58     ` Christoph Hellwig
2016-05-31 12:05 ` [PATCH 3/5] scsi: " Johannes Thumshirn
2016-06-01  7:59   ` Christoph Hellwig
2016-06-01  8:04     ` Johannes Thumshirn
2016-05-31 12:05 ` Johannes Thumshirn [this message]
2016-05-31 12:05 ` [PATCH 5/5] ethernet: " Johannes Thumshirn
2016-05-31 12:05   ` [Intel-wired-lan] " Johannes Thumshirn
2016-06-01  7:59   ` Christoph Hellwig
2016-06-01  7:59     ` [Intel-wired-lan] " Christoph Hellwig
2016-06-01  8:51     ` Johannes Thumshirn
2016-06-01  8:51       ` [Intel-wired-lan] " Johannes Thumshirn
2016-06-01 14:56       ` Jeff Kirsher
2016-06-01 14:56         ` [Intel-wired-lan] " Jeff Kirsher
2016-06-01 15:26         ` Johannes Thumshirn
2016-06-01 15:26           ` [Intel-wired-lan] " Johannes Thumshirn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ceba6b07c133813ff6656d8876751a7e6244b05a.1464694724.git.jthumshirn@suse.de \
    --to=jthumshirn@suse.de \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=haver@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.