]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: mite: export mite_alloc_ring() and mite_free_ring()
authorIan Abbott <abbotti@mev.co.uk>
Fri, 14 Sep 2012 16:34:22 +0000 (17:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 12:09:07 +0000 (05:09 -0700)
The `mite_alloc_ring()` and `mite_free_ring()` static inline functions
in "mite.h" are reasonably large.  Transfer them to "mite.c" and export
them.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/mite.c
drivers/staging/comedi/drivers/mite.h

index 7a767918574e711cc0e0698e4de2d04a01e45bff..c67a94d06ca99b9c3b7d741b7e70386b992387cd 100644 (file)
@@ -257,6 +257,41 @@ void mite_list_devices(void)
 }
 EXPORT_SYMBOL(mite_list_devices);
 
+struct mite_dma_descriptor_ring *mite_alloc_ring(struct mite_struct *mite)
+{
+       struct mite_dma_descriptor_ring *ring =
+           kmalloc(sizeof(struct mite_dma_descriptor_ring), GFP_KERNEL);
+
+       if (ring == NULL)
+               return ring;
+       ring->hw_dev = get_device(&mite->pcidev->dev);
+       if (ring->hw_dev == NULL) {
+               kfree(ring);
+               return NULL;
+       }
+       ring->n_links = 0;
+       ring->descriptors = NULL;
+       ring->descriptors_dma_addr = 0;
+       return ring;
+};
+EXPORT_SYMBOL(mite_alloc_ring);
+
+void mite_free_ring(struct mite_dma_descriptor_ring *ring)
+{
+       if (ring) {
+               if (ring->descriptors) {
+                       dma_free_coherent(ring->hw_dev,
+                                         ring->n_links *
+                                         sizeof(struct mite_dma_descriptor),
+                                         ring->descriptors,
+                                         ring->descriptors_dma_addr);
+               }
+               put_device(ring->hw_dev);
+               kfree(ring);
+       }
+};
+EXPORT_SYMBOL(mite_free_ring);
+
 struct mite_channel *mite_request_channel_in_range(struct mite_struct *mite,
                                                   struct
                                                   mite_dma_descriptor_ring
index 21205782cfd5df06aab4b5d6c418b33c76eaa774..1e04b090437080caba3fb48fe182cf99d61304f8 100644 (file)
@@ -77,40 +77,6 @@ struct mite_struct {
        spinlock_t lock;
 };
 
-static inline struct mite_dma_descriptor_ring *mite_alloc_ring(struct
-                                                              mite_struct
-                                                              *mite)
-{
-       struct mite_dma_descriptor_ring *ring =
-           kmalloc(sizeof(struct mite_dma_descriptor_ring), GFP_KERNEL);
-       if (ring == NULL)
-               return ring;
-       ring->hw_dev = get_device(&mite->pcidev->dev);
-       if (ring->hw_dev == NULL) {
-               kfree(ring);
-               return NULL;
-       }
-       ring->n_links = 0;
-       ring->descriptors = NULL;
-       ring->descriptors_dma_addr = 0;
-       return ring;
-};
-
-static inline void mite_free_ring(struct mite_dma_descriptor_ring *ring)
-{
-       if (ring) {
-               if (ring->descriptors) {
-                       dma_free_coherent(ring->hw_dev,
-                                         ring->n_links *
-                                         sizeof(struct mite_dma_descriptor),
-                                         ring->descriptors,
-                                         ring->descriptors_dma_addr);
-               }
-               put_device(ring->hw_dev);
-               kfree(ring);
-       }
-};
-
 extern struct mite_struct *mite_devices;
 
 static inline unsigned int mite_irq(struct mite_struct *mite)
@@ -127,6 +93,8 @@ int mite_setup(struct mite_struct *mite);
 int mite_setup2(struct mite_struct *mite, unsigned use_iodwbsr_1);
 void mite_unsetup(struct mite_struct *mite);
 void mite_list_devices(void);
+struct mite_dma_descriptor_ring *mite_alloc_ring(struct mite_struct *mite);
+void mite_free_ring(struct mite_dma_descriptor_ring *ring);
 struct mite_channel *mite_request_channel_in_range(struct mite_struct *mite,
                                                   struct
                                                   mite_dma_descriptor_ring