Skip to content

Commit

Permalink
staging: comedi: dt3000: use pci_ioremap_bar()
Browse files Browse the repository at this point in the history
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 the bar.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 81d985a commit 55d2a20
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ static const struct dt3k_boardtype dt3k_boardtypes[] = {
},
};

#define DT3000_SIZE (4*0x1000)

/* dual-ported RAM location definitions */

#define DPR_DAC_buffer (4*0x000)
Expand Down Expand Up @@ -720,7 +718,6 @@ static int dt3000_auto_attach(struct comedi_device *dev,
const struct dt3k_boardtype *this_board = NULL;
struct dt3k_private *devpriv;
struct comedi_subdevice *s;
resource_size_t pci_base;
int ret = 0;

if (context < ARRAY_SIZE(dt3k_boardtypes))
Expand All @@ -739,8 +736,7 @@ static int dt3000_auto_attach(struct comedi_device *dev,
if (ret < 0)
return ret;

pci_base = pci_resource_start(pcidev, 0);
devpriv->io_addr = ioremap(pci_base, DT3000_SIZE);
devpriv->io_addr = pci_ioremap_bar(pcidev, 0);
if (!devpriv->io_addr)
return -ENOMEM;

Expand Down

0 comments on commit 55d2a20

Please sign in to comment.