---

yaml --- r: 325310 b: refs/heads/master c: ca8eb8d h: refs/heads/master v: v3
git-mirror · Sep 17, 2012 · 0beb7b9 · 0beb7b9
1 parent 4887c00
commit 0beb7b9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d799773f6837b44f4dca8d298c2be4d524d3331e
+refs/heads/master: ca8eb8d5c8aa1a0828d381b213b14e13961f5297
diff --git a/trunk/drivers/staging/comedi/drivers/mite.c b/trunk/drivers/staging/comedi/drivers/mite.c
@@ -66,28 +66,39 @@ EXPORT_SYMBOL(mite_devices);
 
 #define TOP_OF_PAGE(x) ((x)|(~(PAGE_MASK)))
 
+struct mite_struct *mite_alloc(struct pci_dev *pcidev)
+{
+	struct mite_struct *mite;
+	unsigned int i;
+
+	mite = kzalloc(sizeof(*mite), GFP_KERNEL);
+	if (mite) {
+		spin_lock_init(&mite->lock);
+		mite->pcidev = pcidev;
+		for (i = 0; i < MAX_MITE_DMA_CHANNELS; ++i) {
+			mite->channels[i].mite = mite;
+			mite->channels[i].channel = i;
+			mite->channels[i].done = 1;
+		}
+	}
+	return mite;
+}
+EXPORT_SYMBOL(mite_alloc);
+
 static void mite_init(void)
 {
 	struct pci_dev *pcidev = NULL;
 	struct mite_struct *mite;
 
 	for_each_pci_dev(pcidev) {
 		if (pcidev->vendor == PCI_VENDOR_ID_NI) {
-			unsigned i;
-
-			mite = kzalloc(sizeof(*mite), GFP_KERNEL);
+			mite = mite_alloc(pcidev);
 			if (!mite) {
 				pr_err("allocation failed\n");
 				pci_dev_put(pcidev);
 				return;
 			}
-			spin_lock_init(&mite->lock);
-			mite->pcidev = pci_dev_get(pcidev);
-			for (i = 0; i < MAX_MITE_DMA_CHANNELS; ++i) {
-				mite->channels[i].mite = mite;
-				mite->channels[i].channel = i;
-				mite->channels[i].done = 1;
-			}
+			pci_dev_get(pcidev);
 			mite->next = mite_devices;
 			mite_devices = mite;
 		}
@@ -213,7 +224,7 @@ static void mite_cleanup(void)
 	for (mite = mite_devices; mite; mite = next) {
 		pci_dev_put(mite->pcidev);
 		next = mite->next;
-		kfree(mite);
+		mite_free(mite);
 	}
 }
 

diff --git a/trunk/drivers/staging/comedi/drivers/mite.h b/trunk/drivers/staging/comedi/drivers/mite.h
@@ -80,6 +80,13 @@ struct mite_struct {
 
 extern struct mite_struct *mite_devices;
 
+struct mite_struct *mite_alloc(struct pci_dev *pcidev);
+
+static inline void mite_free(struct mite_struct *mite)
+{
+	kfree(mite);
+}
+
 static inline unsigned int mite_irq(struct mite_struct *mite)
 {
 	return mite->pcidev->irq;