[PATCH 32/90] staging: comedi: amplc_pc236: store the pci_dev in the comedi_device

Ian Abbott abbotti at mev.co.uk
Thu Jul 19 10:39:34 UTC 2012


On 2012-07-19 11:30, Ian Abbott wrote:
> On 2012-07-19 02:39, 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.
>
> The detach() routine should really check thisboard->bustype for
> robustness, as NULL hw_dev doesn't necessarily mean its a PCI device.
> The original code should have checked thisboard->bustype too although it
> works by accident because dev->iobase is 0.

I can submit a patch to add thisboard->bustype checks in the detach 
routine after your patch is applied.

-- 
-=( 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