From e783f8d84f368fcae3e4352eeb25926d21337836 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 24 Sep 2012 13:23:22 -0700 Subject: [PATCH] --- yaml --- r: 325531 b: refs/heads/master c: 4f6c7bf992bc6f1bbf38b08e9b3c8a21865888f2 h: refs/heads/master i: 325529: 60edfc7c47fe98c1a15ecc5dd97c74139a65e6df 325527: 57fefe82807d511a67ed9a7f25c01d5e3edc5c4f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/s626.c | 12 ++++-------- trunk/drivers/staging/comedi/drivers/s626.h | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 484c2f351f66..95ff3a6ea2c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58f4a8fce1d6f1e42543376c85839576992e6100 +refs/heads/master: 4f6c7bf992bc6f1bbf38b08e9b3c8a21865888f2 diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c index 12709b0bbba1..6f6c808509cd 100644 --- a/trunk/drivers/staging/comedi/drivers/s626.c +++ b/trunk/drivers/staging/comedi/drivers/s626.c @@ -2446,7 +2446,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) /* unsigned int data[16]; */ int i; int ret; - resource_size_t resourceStart; dma_addr_t appdma; struct comedi_subdevice *s; @@ -2461,13 +2460,10 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) return ret; dev->iobase = 1; /* detach needs this */ - resourceStart = pci_resource_start(pcidev, 0); - - devpriv->base_addr = ioremap(resourceStart, SIZEOF_ADDRESS_SPACE); - if (devpriv->base_addr == NULL) { - printk(KERN_ERR "s626_attach: IOREMAP failed\n"); - return -ENODEV; - } + devpriv->base_addr = ioremap(pci_resource_start(pcidev, 0), + pci_resource_len(pcidev, 0)); + if (!devpriv->base_addr) + return -ENOMEM; if (devpriv->base_addr) { /* disable master interrupt */ diff --git a/trunk/drivers/staging/comedi/drivers/s626.h b/trunk/drivers/staging/comedi/drivers/s626.h index 8a8f196cf153..ff4b3a5e4e5f 100644 --- a/trunk/drivers/staging/comedi/drivers/s626.h +++ b/trunk/drivers/staging/comedi/drivers/s626.h @@ -73,7 +73,6 @@ #include #define S626_SIZE 0x0200 -#define SIZEOF_ADDRESS_SPACE 0x0200 #define DMABUF_SIZE 4096 /* 4k pages */ #define S626_ADC_CHANNELS 16