diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-24 16:23:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 12:37:30 -0400 |
commit | 4f6c7bf992bc6f1bbf38b08e9b3c8a21865888f2 (patch) | |
tree | 70b75e10b94a99f92dd82f342dbecc720624f631 | |
parent | 58f4a8fce1d6f1e42543376c85839576992e6100 (diff) |
staging: comedi: s626: cleanup ioremap()
The local variable 'resourceStart' is only used in the ioremap()
to hold the PCI bar 0 base address. Just use the pci_resource_start()
directly in the ioremap().
Also, instead of assuming the resource size for the ioremap, use
pci_resource_len() to get the actual size.
Remove the kernel noise when the ioremap fails and change the error
code from -ENODEV to -ENOMEM.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 12 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/s626.h | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 12709b0bbba1..6f6c808509cd 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c | |||
@@ -2446,7 +2446,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) | |||
2446 | /* unsigned int data[16]; */ | 2446 | /* unsigned int data[16]; */ |
2447 | int i; | 2447 | int i; |
2448 | int ret; | 2448 | int ret; |
2449 | resource_size_t resourceStart; | ||
2450 | dma_addr_t appdma; | 2449 | dma_addr_t appdma; |
2451 | struct comedi_subdevice *s; | 2450 | struct comedi_subdevice *s; |
2452 | 2451 | ||
@@ -2461,13 +2460,10 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) | |||
2461 | return ret; | 2460 | return ret; |
2462 | dev->iobase = 1; /* detach needs this */ | 2461 | dev->iobase = 1; /* detach needs this */ |
2463 | 2462 | ||
2464 | resourceStart = pci_resource_start(pcidev, 0); | 2463 | devpriv->base_addr = ioremap(pci_resource_start(pcidev, 0), |
2465 | 2464 | pci_resource_len(pcidev, 0)); | |
2466 | devpriv->base_addr = ioremap(resourceStart, SIZEOF_ADDRESS_SPACE); | 2465 | if (!devpriv->base_addr) |
2467 | if (devpriv->base_addr == NULL) { | 2466 | return -ENOMEM; |
2468 | printk(KERN_ERR "s626_attach: IOREMAP failed\n"); | ||
2469 | return -ENODEV; | ||
2470 | } | ||
2471 | 2467 | ||
2472 | if (devpriv->base_addr) { | 2468 | if (devpriv->base_addr) { |
2473 | /* disable master interrupt */ | 2469 | /* disable master interrupt */ |
diff --git a/drivers/staging/comedi/drivers/s626.h b/drivers/staging/comedi/drivers/s626.h index 8a8f196cf153..ff4b3a5e4e5f 100644 --- a/drivers/staging/comedi/drivers/s626.h +++ b/drivers/staging/comedi/drivers/s626.h | |||
@@ -73,7 +73,6 @@ | |||
73 | #include <linux/slab.h> | 73 | #include <linux/slab.h> |
74 | 74 | ||
75 | #define S626_SIZE 0x0200 | 75 | #define S626_SIZE 0x0200 |
76 | #define SIZEOF_ADDRESS_SPACE 0x0200 | ||
77 | #define DMABUF_SIZE 4096 /* 4k pages */ | 76 | #define DMABUF_SIZE 4096 /* 4k pages */ |
78 | 77 | ||
79 | #define S626_ADC_CHANNELS 16 | 78 | #define S626_ADC_CHANNELS 16 |