addi ones,
that need additional work before they can be converted cleanly.
H Hartley Sweeten (90):
staging: comedi: comedidev.h: introduce comedi_to_pci_dev() helper
staging: comedi: adl_pci6208: store the pci_dev in the comedi_device
staging: comedi: adl_pci7230: store the pci_dev in the comedi_devi
Introduce a wrapper for to_pci_dev() to allow the comedi pci drivers
to store the pci_dev pointer in the comedi_device hw_dev variable and
retrieve it easily.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/comedidev.h | 5 +
1 file
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci7230.c | 19 +++
1 file changed, 11 insertions
The private data is no longer needed by this driver. Remove the
struct, devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci7230.c | 9 -
1 file changed, 9 deletions(-)
diff --git a
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci6208.c | 19 ++-
1 file changed, 10 insertions
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci7296.c | 19 +++
1 file changed, 11 insertions
The private data is no longer needed by this driver. Remove the
struct, devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci7296.c | 9 -
1 file changed, 9 deletions(-)
diff --git a
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci7432.c | 19 +++
1 file changed, 11 insertions
The private data is no longer needed by this driver. Remove the
struct, devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci7432.c | 9 -
1 file changed, 9 deletions(-)
diff --git a
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci8164.c | 19 +++
1 file changed, 11 insertions
The private data is no longer needed by this driver. Remove the
struct, devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci8164.c | 9 -
1 file changed, 9 deletions(-)
diff --git a
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci9111.c | 29 +++-
1 file changed, 16
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adl_pci9118.c | 33 +++-
1 file changed, 18
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1723.c | 42 +---
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git
Use for_each_pci_dev() instead of open-coding the loop using
pci_get_device().
Drop the printk error messages. They just add noise.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1723.c | 63
1
Use pci_is_enabled() in the "find pci device" function to determine if
the found pci device is not in use and move the comedi_pci_enable() call
into the attach.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1723.c | 23 +--
1 file changed, 13
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1710.c | 42 ++--
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git
Use for_each_pci_dev() instead of open-coding the loop using
pci_get_device().
Drop the printk error messages. They just add noise.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1710.c | 63
1
Use pci_is_enabled() in the "find pci device" function to determine if
the found pci device is not in use and move the comedi_pci_enable() call
into the attach.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci1710.c | 25 ++---
1 file changed, 14
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci_dio.c | 48 +---
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git
This driver creates a linked list of all the pci devices in
the system while it's looking for a match. It's only use is
to determine if a device is "free" to use. The pci_is_enabled()
helper can give us the same information. Use that instead and
remove the linked list.
Sign
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 message for a match. It's just add noise.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
dr
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/adv_pci_dio.c | 23 ---
1 file changed, 12
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidas.c | 32 --
1 file changed, 17
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidio.c | 54 ++
1 file changed, 25 insertions(+), 29 deletions(-)
diff --git
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
Cc: Ian Abbot
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidio.c | 25 -
1 file changed, 12
Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_dio200.c | 42 ++-
1 file changed, 15 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c
b/drivers/staging/comedi/drivers/amplc_dio200.c
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_dio200.c | 31 +++-
Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_pc236.c | 43 +++-
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c
b/drivers/staging/comedi/drivers/amplc_pc236.c
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_pc236.c | 28 -
Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_pc263.c | 42 +++-
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c
b/drivers/staging/comedi/drivers/amplc_pc263.c
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
Cc: Ian Ab
Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_pci224.c | 43 ++-
1 file changed, 16 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c
b/drivers/staging/comedi/drivers/amplc_pci224.c
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_pci224.c | 19 ++-
1 file changed, 10 insertions
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/amplc_pci230.c | 25 +++--
1 file changed, 11
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidas64.c | 57 ++--
1 file changed, 29 insertions(+), 28 deletions(-)
diff --git
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
Cc: Ian Abbot
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
driv
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidda.c | 60 --
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git
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
Cc: Ian Abbot
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
driv
Save the pci bar in dev->iobase instead of carrying it in the
private data.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidio.c | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/stag
The private data is no longer needed by this driver. Remove the
struct, devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcidio.c | 24
1 file changed, 24 deletions(-)
diff
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 61 +++--
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git
se.
Reword the dev_err when no match is found.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 38 -
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/comedi/drivers/
Remove the dev_dbg output of the pci addresses. It's just add noise.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas
Remove the unused variables from the private data.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 9 -
1 file changed, 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c
b/drivers/staging
The pci resource bar 1 address is not used in the driver. Remove
it from the private data.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/comedi
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 7 +++
1 file
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 12 +---
1 file chan
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 29 +
1 file changed, 13
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 92 ++---
1 file changed, 50 insertions(+), 42 deletions(-)
diff --git
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 27
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 13 ++---
1 file changed, 6 insertions(+), 7
The private data is no longer needed by this driver. Remove the
struct, devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 9 -
1 file changed, 9 deletions(-)
diff --git a
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/daqboard2000.c | 68 +++
1 file changed, 39 insertions(+), 29 deletions(-)
diff --git
nd.
Consolidate the dev_err messages when a device is not found
into a single message.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/daqboard2000.c | 56 ++-
1 file changed, 20 insertions(+), 36 deletions(-)
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 Swe
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/daqboard2000.c | 15 ---
1 file changed, 8 insertions(+), 7
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/d
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 S
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers
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
Cc: Ian
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dt3000.c | 16
1 file changed, 8 insertions(+), 8
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 71 ++-
1 file changed, 38 insertions(+), 33 deletions(-)
diff --git
Cleanup the "find pci device" code so that it follows the style
of the other comedi pci drivers.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 58 ---
1 file changed, 17 inserti
The comedi core already has a mutex protecting the attach/detach
of the comedi drivers.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 15 ++-
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a
This variable is set at the end of the attach but never used
in the driver. Remove it.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers
All of the pci device base address registers are saved in the private
data but only bar2 and bar3 are used by the driver. Remove the others.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 7 +--
1 file changed, 1
Use dev->iobase to hold one of the pci base addresses used
by the driver instead of carrying it in the private data.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 10 +-
1 file changed, 5 insertions(+)
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 12 ++--
1 file changed, 6 insertions(+), 6
The detach for this driver is missing the check to make sure
that the pci device is enabled before disabling it.
It's also missing the pci_dev_put().
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 +++-
1
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/ke_counter.c | 37 -
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git
Cleanup the "find pci device" code so that it follows the style
of the other comedi pci drivers.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/ke_counter.c | 60 +++--
1 file changed, 23 inserti
Cleanup the attach function a bit to follow the style of
the other comedi pci drivers.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/ke_counter.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a
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 was the only thing in the private data, remove
the struct, the devpriv macro, and it's allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg
This macro is an open-coded version of ARRAY_SIZE(). Use that
instead.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/ke_counter.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers
Factor the "find pci device" code out of the attach function.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/me_daq.c | 49 -
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git
Cleanup the "find pci device" code so that it follows the style
of the other comedi pci drivers.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/me_daq.c | 63 -
1 file changed, 23 inserti
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 was the only thing in the private data, remove
the struct, the devpriv macro, and it's allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg
This is just noise.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/rtd520.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/rtd520.c
b/drivers/staging/comedi/drivers/rtd520.c
index 9998d6b
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 Swe
This driver has code #if 0'ed out that would allow cleaning up
the attach if there was an error. The comedi core currently
calls the detach function to do this if the attach fails.
Remove the #if 0'ed out code.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kro
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
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/rtd520.c | 48 -
1 file changed, 24
The private data is not used by this driver. Remove the struct,
devpriv macro, and the allocation.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/aio_iiro_16.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/drivers
The 'data' and 'pci_dev' variables in the private data are not used.
They appear to be cut-and-paste from the skel driver. Remove them.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbott
Cc: Greg Kroah-Hartman
---
drivers/staging/comedi/drivers/s526.c | 8
1 file
On Thursday, July 19, 2012 2:23 AM, Ian Abbott wrote:
> On 2012-07-19 02:24, H Hartley Sweeten wrote:
>> Introduce a wrapper for to_pci_dev() to allow the comedi pci drivers
>> to store the pci_dev pointer in the comedi_device hw_dev variable and
>> retrieve it easily.
&
On Thursday, July 19, 2012 2:38 AM, Ian Abbott wrote:
> On 2012-07-19 02:30, H Hartley Sweeten wrote:
>> Use pci_is_enabled() in the "find pci device" function to determine if
>> the found pci device is not in use and move the comedi_pci_enable() call
>> into the
On Thursday, July 19, 2012 3:11 AM, Ian Abbott wrote:
> On 2012-07-19 02:37, H Hartley Sweeten wrote:
>> 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
On Thursday, July 19, 2012 3:27 AM, Ian Abbott wrote:
> On 2012-07-19 11:10, Ian Abbott wrote:
>> On 2012-07-19 02:37, H Hartley Sweeten wrote:
>>> Use the hw_dev pointer in the comedi_device struct to hold the
>>> pci_dev instead of carrying it in the private data.
>
On Thursday, July 19, 2012 9:32 AM, Dan Carpenter wrote:
> On Thu, Jul 19, 2012 at 11:20:52AM -0500, H Hartley Sweeten wrote:
>> On Thursday, July 19, 2012 2:23 AM, Ian Abbott wrote:
>>> That needs to be something like:
>>>
>>> return dev->hw_dev ? to_
Introduce a wrapper for to_pci_dev() to allow the comedi_pci_drivers
to store the pci_dev pointer in the comedi_device hw_dev variable and
retrieve it easily.
Signed-off-by: H Hartley Sweeten
Cc: Ian Abbot
Cc: Greg Kroah-Hartman
---
v2: Ian Abbott pointed out that the dev->hw_dev needs to
On Thursday, July 19, 2012 5:42 AM, Ian Abbott wrote:
> On 2012-07-19 03:05, H Hartley Sweeten wrote:
>> Use the hw_dev pointer in the comedi_device struct to hold the
>> pci_dev instead of carrying it in the private data.
>
> My reply to patch 86 has a knock-on
On Thursday, July 19, 2012 4:17 PM, gregkh wrote:
> On Thu, Jul 19, 2012 at 12:12:02PM -0500, H Hartley Sweeten wrote:
>> I was planning on making a comedi_find_pci_dev() function that the
>> drivers could call with a "match" callback. This would allow a common
&g
On Thursday, July 19, 2012 4:35 PM, gregkh wrote:
> On Thu, Jul 19, 2012 at 06:31:23PM -0500, H Hartley Sweeten wrote:
>> If the comedi pci drivers have the "attach_pci" callback defined, the
>> PCI api does correctly probe the driver. The comedi_pci_auto_config()
&
601 - 700 of 716 matches
Mail list logo