From 6fff79f6931139de120d39bcf5d5c2c0991aeb41 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 10 Apr 2013 11:29:07 -0700 Subject: [PATCH] --- yaml --- r: 364109 b: refs/heads/master c: 55d2a208923e655d3453b66676f957b0d60be108 h: refs/heads/master i: 364107: 54043327847a863c99ad042c8b8d91b0b54107b9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/dt3000.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0eed56292627..ff0b62a693b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81d985a11e9a51eb88ddea98df8d60bfdda7cafb +refs/heads/master: 55d2a208923e655d3453b66676f957b0d60be108 diff --git a/trunk/drivers/staging/comedi/drivers/dt3000.c b/trunk/drivers/staging/comedi/drivers/dt3000.c index 909656ba51b5..7e03929c9a14 100644 --- a/trunk/drivers/staging/comedi/drivers/dt3000.c +++ b/trunk/drivers/staging/comedi/drivers/dt3000.c @@ -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) @@ -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)) @@ -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;