Re: [PATCH 30/90] staging: comedi: amplc_dio200: store the pci_devin the comedi_device

From: Ian Abbott
Date: Thu Jul 19 2012 - 06:38:35 EST

On 2012-07-19 11:27, 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.

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.

No, you really need to check thisboard->bustype in the detach() because
hw_dev might be NULL for a PCI board if the attach() failed.

Actually, your patch wouldn't do any harm as dev->iobase would be 0. It
would just go through the "failed ISA device" path instead of the
"failed PCI device" path. It would be more robust to check
thisboard->bustype though.

I don't mind if your original patch is applied as it does no harm. If so, I'll submit a patch afterwards to check the bus type in the detach().

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

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at