From: H Hartley Sweeten Date: Thu, 19 Jul 2012 01:40:01 +0000 (-0700) Subject: staging: comedi: amplc_pc263: store the pci_dev in the comedi_device X-Git-Tag: v3.6-rc1~100^2~111 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69fa3b755eb4ed8754a761a1528504ca9681e4b0;p=pandora-kernel.git staging: comedi: amplc_pc263: store the pci_dev in the comedi_device 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed