- 19 Jul, 2012 40 commits
-
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. 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>
-
H Hartley Sweeten authored
The 'phys_addr' variable in the private data is simply used as a flag for the detach function to know that the pci device has been enabled. Use the 'dev->iobase' variable instead as is more typical for other comedi pci drivers. Signed-off-by:
-
H Hartley Sweeten authored
The setup_pci() function simply calls comedi_pci_enable() to enable the device then ioremaps the pci address. Move the code directly into the attach function as is more typical for the comedi pci drivers. Signed-off-by:
-
H Hartley Sweeten authored
The "find pci device" code for this driver was split between two functions which could cause the driver to walk the pci bus multiple times while looking for a match. Consolidate the functions into the format that is more standard for the comedi pci drivers. Signed-off-by:
-
H Hartley Sweeten authored
The private data variable 'plx' is an ioremap'ed pci resource and should be a void __iomem *. This quiets a number of sparse warnings about "different address spaces". Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Signed-off-by:
-
H Hartley Sweeten authored
The 'got_regions' variable in the private data is used as a flag for the detach to know if the pci device has been enabled. Typically the dev->iobase variable is used to indicate this in all the other comedi drivers. Do the same here for consistancy. Signed-off-by:
-
H Hartley Sweeten authored
The "find pci device" code for this driver was quite a bit different from the other comedi pci drivers. Clean it up so it follows the format of the other drivers. Use for_each_pci_dev() instead of open-coding the loop using pci_get_device(). Check for a specific bus/slot then the vendor/device ids. The loop checking for the matching boardinfo was creating an "id" based on the subsystem_device and subsystem_vendor info from the pci_dev. The vendor id was already checked so just check against the subsystem_device. Only return the pci_dev if a matching boardinfo is found. Consolidate the dev_err messages when a device is not found into a single message. Signed-off-by:
-
H Hartley Sweeten authored
Factor the "find pci device" code out of the attach function. Signed-off-by:
-
H Hartley Sweeten authored
The private data is no longer needed by this driver. Remove the struct, devpriv macro, and the allocation. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Signed-off-by:
-
H Hartley Sweeten authored
Add a couple local variables and reorder the tests to make to make the more concise. Change the printk to a dev_err when no match is found and reword the message. Signed-off-by:
-
H Hartley Sweeten authored
Factor the "find pci device" code out of the attach function. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Signed-off-by:
-
H Hartley Sweeten authored
The pci resource bar 0 address is only used as a "flag" to let the datach function know that the pci device has been enabled. Use dev->iobase in the detach instead and remove BADR0 from the private data. Signed-off-by:
-
H Hartley Sweeten authored
The pci resource bar 2 address is the primary i/o address used by this device. Store it in dev->iobase and remove it from the private data. Signed-off-by:
-
H Hartley Sweeten authored
The pci resource bar 4 address is only needed to initialize the 8255 subdevice. Use a local variable to hold it and remove it from the private data. Signed-off-by:
-
H Hartley Sweeten authored
The pci resource bar 1 address is not used in the driver. Remove it from the private data. Signed-off-by:
-
H Hartley Sweeten authored
Remove the unused variables from the private data. Signed-off-by:
-
H Hartley Sweeten authored
Remove the dev_dbg output of the pci addresses. It's just add noise. Signed-off-by:
-
H Hartley Sweeten authored
Add a couple local variables to make the tests more concise. Reorder the tests to make the for() loop checking for a matching boardtype quicker. Use ARRAY_SIZE() to determine the number of boards instead of the hard-coded '1'. Drop the dev_dbg for a match. It's just add noise. Reword the dev_err when no match is found. Signed-off-by:
-
H Hartley Sweeten authored
Factor the "find pci device" code out of the attach function. Signed-off-by:
-
H Hartley Sweeten authored
The private data is no longer needed by this driver. Remove the struct, devpriv macro, and the allocation. Signed-off-by:
-
H Hartley Sweeten authored
Save the pci bar in dev->iobase instead of carrying it in the private data. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Save the pci bar in dev->iobase so the detach is consistent with the other comedi pci drivers. Signed-off-by:
-
H Hartley Sweeten authored
Add a couple local variables to make the tests more concise. Reorder the tests to make the for() loop checking for a matching boardtype quicker. Drop the dev_dbg for a match. It's just add noise. Reword the dev_err when no match is found. Signed-off-by:
-
H Hartley Sweeten authored
Factor the "find pci device" code out of the attach function. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Save the pci bar in dev->iobase so the detach is consistent with the other comedi pci drivers. Signed-off-by:
-
H Hartley Sweeten authored
Add a couple local variables to make the tests more concise. Reorder the tests to make the for() loop checking for a matching boardtype quicker. Drop the dev_dbg for a match. It's just add noise. Reword the dev_err when no match is found. Signed-off-by:
-
H Hartley Sweeten authored
Factor the "find pci device" code out of the attach function. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, rename the function and pass the comedi_devconfig struct instead of pre-parsing out the bus/slot information. Consolidate the dev_err messages when a pci device is not found. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, rename the function and pass the comedi_devconfig struct instead of pre-parsing out the bus/slot information. Use for_each_pci_dev() instead of open-coding the loop using pci_get_device(). Consolidate the dev_err messages when a pci device is not found. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Since the pci_dev is no longer held in the provate data, we can also cleanup the detach a bit. Remove the IS_ENABLED() tests in the detach. If the pci_dev is non NULL it's a PCI device otherwise it's an ISA device. Using IS_ENABLED() to omit the code paths makes the code a bit confusing and doesn't save much. Since the pci_dev was the only thing in the private data, remove the struct, and it's allocation. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, rename the function and pass the comedi_devconfig struct instead of pre-parsing out the bus/slot information. Use for_each_pci_dev() instead of open-coding the loop using pci_get_device(). Consolidate the dev_err messages when a pci device is not found. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Since the pci_dev is no longer held in the provate data, we can also cleanup the detach a bit. Remove the IS_ENABLED() tests in the detach. If the pci_dev is non NULL it's a PCI device otherwise it's an ISA device. Using IS_ENABLED() to omit the code paths makes the code a bit confusing and doesn't save much. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, rename the function and pass the comedi_devconfig struct instead of pre-parsing out the bus/slot information. Use for_each_pci_dev() instead of open-coding the loop using pci_get_device(). Consolidate the dev_err messages when a pci device is not found. Signed-off-by:
-
H Hartley Sweeten authored
Use the hw_dev pointer in the comedi_device struct to hold the pci_dev instead of carrying it in the private data. Since the pci_dev is no longer held in the provate data, we can also cleanup the detach a bit. Remove the IS_ENABLED() tests in the detach. If the pci_dev is non NULL it's a PCI device otherwise it's an ISA device. Using IS_ENABLED() to omit the code paths makes the code a bit confusing and doesn't save much. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, rename the function and pass the comedi_devconfig struct instead of pre-parsing out the bus/slot information. Use for_each_pci_dev() instead of open-coding the loop using pci_get_device(). Consolidate the dev_err messages when a pci device is not found. Signed-off-by:
-
