[PATCH 34/90] staging: comedi: amplc_pc263: store the pci_dev in the comedi_device

Ian Abbott abbotti at mev.co.uk
Thu Jul 19 10:41:24 UTC 2012


On 2012-07-19 02:40, 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 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.

As mentioned for amplc_dio200 and amplc_pc236, the detach() routine 
ought to check thisboard->bustype although the original code and the 
patched version should work fine as dev->iobase will be 0 on failure.

I'll submit a patch later to check thisboard->bustype in the detach() 
routine for robustness.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-





More information about the devel mailing list