From f4cf56b595a0737a25e197f682bc474c22b2dde1 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 19 Jul 2012 10:39:33 -0700 Subject: [PATCH] --- yaml --- r: 318044 b: refs/heads/master c: ddb01367b85df2c4c773bde047e5b04b6de1835b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index da3f31faa92e..a57164d3b81b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 289a64295c9ae897c18302c15abd8f0464e8c6cb +refs/heads/master: ddb01367b85df2c4c773bde047e5b04b6de1835b diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index de8c99c34070..f713783ef624 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -446,6 +446,11 @@ static inline void comedi_set_hw_dev(struct comedi_device *dev, } } +static inline struct pci_dev *comedi_to_pci_dev(struct comedi_device *dev) +{ + return dev->hw_dev ? to_pci_dev(dev->hw_dev) : NULL; +} + int comedi_buf_put(struct comedi_async *async, short x); int comedi_buf_get(struct comedi_async *async, short *x);