Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc375088 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: mite: use pci_ioremap_bar() 



Use pci_ioremap_bar() to ioremap the PCI resources. That function
just takes the pci device and a bar number. It also has some
additional sanity checks to make sure the bar is actually a
memory resource.

This also makes sure that the entire PCI bar is ioremap'ed instead
of assuming the size of a bar.

For aesthetic reasons, don't set the private data phys_addr vars
until after the ioremap is successful.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b153c68d

drivers/staging/comedi/drivers/mite.c

+5 −16
Original line number Diff line number Diff line
@@ -58,10 +58,6 @@ 
#include "comedi_fc.h"

#include "mite.h"



#define PCI_MITE_SIZE		4096

#define PCI_DAQ_SIZE		4096

#define PCI_DAQ_SIZE_660X       8192



#define TOP_OF_PAGE(x) ((x)|(~(PAGE_MASK)))



struct mite_struct *mite_alloc(struct pci_dev *pcidev)
@@ -104,35 +100,28 @@ static unsigned mite_fifo_size(struct mite_struct *mite, unsigned channel) 
int mite_setup2(struct mite_struct *mite, unsigned use_iodwbsr_1)

{

	unsigned long length;

	resource_size_t addr;

	int i;

	u32 csigr_bits;

	unsigned unknown_dma_burst_bits;



	pci_set_master(mite->pcidev);



	addr = pci_resource_start(mite->pcidev, 0);

	mite->mite_phys_addr = addr;

	mite->mite_io_addr = ioremap(addr, PCI_MITE_SIZE);

	mite->mite_io_addr = pci_ioremap_bar(mite->pcidev, 0);

	if (!mite->mite_io_addr) {

		dev_err(&mite->pcidev->dev,

			"Failed to remap mite io memory address\n");

		return -ENOMEM;

	}

	mite->mite_phys_addr = pci_resource_start(mite->pcidev, 0);



	addr = pci_resource_start(mite->pcidev, 1);

	mite->daq_phys_addr = addr;

	length = pci_resource_len(mite->pcidev, 1);

	/*

	 * In case of a 660x board, DAQ size is 8k instead of 4k

	 * (see as shown by lspci output)

	 */

	mite->daq_io_addr = ioremap(mite->daq_phys_addr, length);

	mite->daq_io_addr = pci_ioremap_bar(mite->pcidev, 1);

	if (!mite->daq_io_addr) {

		dev_err(&mite->pcidev->dev,

			"Failed to remap daq io memory address\n");

		return -ENOMEM;

	}

	mite->daq_phys_addr = pci_resource_start(mite->pcidev, 1);

	length = pci_resource_len(mite->pcidev, 1);



	if (use_iodwbsr_1) {

		writel(0, mite->mite_io_addr + MITE_IODWBSR);