---

yaml --- r: 354301 b: refs/heads/master c: 1f021e1 h: refs/heads/master i: 354299: 86e3a08 v: v3
git-mirror · Jan 31, 2013 · fed61b8 · fed61b8
1 parent 0104e69
commit fed61b8
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 309231d7a610554b02084ff7b465e43ef383a3bc
+refs/heads/master: 1f021e1f3b187586e457b4584d0e5f0f5ca5fa15
diff --git a/trunk/drivers/staging/comedi/comedi_pcmcia.c b/trunk/drivers/staging/comedi/comedi_pcmcia.c
@@ -27,6 +27,42 @@
 
 #include "comedidev.h"
 
+/**
+ * comedi_to_pcmcia_dev() - comedi_device pointer to pcmcia_device pointer.
+ * @dev: comedi_device struct
+ */
+struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *dev)
+{
+	return dev->hw_dev ? to_pcmcia_dev(dev->hw_dev) : NULL;
+}
+EXPORT_SYMBOL_GPL(comedi_to_pcmcia_dev);
+
+/**
+ * comedi_pcmcia_auto_config() - Configure/probe a comedi PCMCIA driver.
+ * @link: pcmcia_device struct
+ * @driver: comedi_driver struct
+ *
+ * Typically called from the pcmcia_driver (*probe) function.
+ */
+int comedi_pcmcia_auto_config(struct pcmcia_device *link,
+			      struct comedi_driver *driver)
+{
+	return comedi_auto_config(&link->dev, driver, 0);
+}
+EXPORT_SYMBOL_GPL(comedi_pcmcia_auto_config);
+
+/**
+ * comedi_pcmcia_auto_unconfig() - Unconfigure/remove a comedi PCMCIA driver.
+ * @link: pcmcia_device struct
+ *
+ * Typically called from the pcmcia_driver (*remove) function.
+ */
+void comedi_pcmcia_auto_unconfig(struct pcmcia_device *link)
+{
+	comedi_auto_unconfig(&link->dev);
+}
+EXPORT_SYMBOL_GPL(comedi_pcmcia_auto_unconfig);
+
 /**
  * comedi_pcmcia_driver_register() - Register a comedi PCMCIA driver.
  * @comedi_driver: comedi_driver struct

diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
@@ -465,6 +465,12 @@ static inline void comedi_pci_disable(struct pci_dev *dev)
 /* comedi_pcmcia.c - comedi PCMCIA driver specific functions */
 
 struct pcmcia_driver;
+struct pcmcia_device;
+
+struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *);
+
+int comedi_pcmcia_auto_config(struct pcmcia_device *, struct comedi_driver *);
+void comedi_pcmcia_auto_unconfig(struct pcmcia_device *);
 
 int comedi_pcmcia_driver_register(struct comedi_driver *,
 					struct pcmcia_driver *);