From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933306Ab2GKVtW (ORCPT ); Wed, 11 Jul 2012 17:49:22 -0400 Received: from mail131.messagelabs.com ([216.82.242.99]:6547 "EHLO mail131.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933242Ab2GKVtV (ORCPT ); Wed, 11 Jul 2012 17:49:21 -0400 X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-5.tower-131.messagelabs.com!1342043330!24798556!5 X-Originating-IP: [216.166.12.97] X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked From: H Hartley Sweeten To: Linux Kernel Subject: [PATCH 01/30] staging: comedi: add pci_dev pointer to comedi_device Date: Wed, 11 Jul 2012 14:49:14 -0700 User-Agent: KMail/1.9.9 CC: , , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-ID: <201207111449.15203.hartleys@visionengravers.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The pci_dev pointer in the private driver data is used by every comedi pci driver. Some of them only have the need for the private data because of this pointer. Introduce the pci_dev pointer in the comedi_device struct so it can be used instead of needing it in the private data. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Greg Kroah-Hartman --- drivers/staging/comedi/comedidev.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index de8c99c..55f2373 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -212,6 +212,8 @@ struct comedi_device { * DMA_NONE */ struct device *hw_dev; + struct pci_dev *pcidev; + const char *board_name; const void *board_ptr; int attached; -- 1.7.11