ALSA: hda - Move generic array helpers to core lib

This will be used by the regmap support.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 675614dc2b8803ec0a2f76b3099bbdc2afa19f8d..3abdd3f1652807e38064aed224f75559713af7de 100644 (file)
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -21,6 +21,17 @@ struct hdac_widget_tree;
  */
 extern struct bus_type snd_hda_bus_type;
 
+/*
+ * generic arrays
+ */
+struct snd_array {
+       unsigned int used;
+       unsigned int alloced;
+       unsigned int elem_size;
+       unsigned int alloc_align;
+       void *list;
+};
+
 /*
  * HD-audio codec base device
  */
@@ -178,4 +189,26 @@ static inline void snd_hdac_codec_link_down(struct hdac_device *codec)
        clear_bit(codec->addr, &codec->bus->codec_powered);
 }
 
+/*
+ * generic array helpers
+ */
+void *snd_array_new(struct snd_array *array);
+void snd_array_free(struct snd_array *array);
+static inline void snd_array_init(struct snd_array *array, unsigned int size,
+                                 unsigned int align)
+{
+       array->elem_size = size;
+       array->alloc_align = align;
+}
+
+static inline void *snd_array_elem(struct snd_array *array, unsigned int idx)
+{
+       return array->list + idx * array->elem_size;
+}
+
+static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)
+{
+       return (unsigned long)(ptr - array->list) / array->elem_size;
+}
+
 #endif /* __SOUND_HDAUDIO_H */

diff --git a/sound/hda/Makefile b/sound/hda/Makefile
index eec5da03b41f55d625585047566bdb087bc228aa..e508ba1102cb441d71686692254deabed20e471f 100644 (file)
--- a/sound/hda/Makefile
+++ b/sound/hda/Makefile
@@ -1,4 +1,5 @@
-snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o
+snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \
+       array.o
 
 snd-hda-core-objs += trace.o
 CFLAGS_trace.o := -I$(src)

diff --git a/sound/hda/array.c b/sound/hda/array.c
new file mode 100644 (file)
index 0000000..516795b
--- /dev/null
+++ b/sound/hda/array.c
@@ -0,0 +1,49 @@
+/*
+ * generic arrays
+ */
+
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/hdaudio.h>
+
+/**
+ * snd_array_new - get a new element from the given array
+ * @array: the array object
+ *
+ * Get a new element from the given array.  If it exceeds the
+ * pre-allocated array size, re-allocate the array.
+ *
+ * Returns NULL if allocation failed.
+ */
+void *snd_array_new(struct snd_array *array)
+{
+       if (snd_BUG_ON(!array->elem_size))
+               return NULL;
+       if (array->used >= array->alloced) {
+               int num = array->alloced + array->alloc_align;
+               int size = (num + 1) * array->elem_size;
+               void *nlist;
+               if (snd_BUG_ON(num >= 4096))
+                       return NULL;
+               nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO);
+               if (!nlist)
+                       return NULL;
+               array->list = nlist;
+               array->alloced = num;
+       }
+       return snd_array_elem(array, array->used++);
+}
+EXPORT_SYMBOL_GPL(snd_array_new);
+
+/**
+ * snd_array_free - free the given array elements
+ * @array: the array object
+ */
+void snd_array_free(struct snd_array *array)
+{
+       kfree(array->list);
+       array->used = 0;
+       array->alloced = 0;
+       array->list = NULL;
+}
+EXPORT_SYMBOL_GPL(snd_array_free);

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 145cae7903b61956f6fc01ad03e4b1fbf202295e..10e257ff9084229807983376b59313baec24464a 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -5012,52 +5012,6 @@ void snd_hda_bus_reset(struct hda_bus *bus)
 }
 EXPORT_SYMBOL_GPL(snd_hda_bus_reset);
 
-/*
- * generic arrays
- */
-
-/**
- * snd_array_new - get a new element from the given array
- * @array: the array object
- *
- * Get a new element from the given array.  If it exceeds the
- * pre-allocated array size, re-allocate the array.
- *
- * Returns NULL if allocation failed.
- */
-void *snd_array_new(struct snd_array *array)
-{
-       if (snd_BUG_ON(!array->elem_size))
-               return NULL;
-       if (array->used >= array->alloced) {
-               int num = array->alloced + array->alloc_align;
-               int size = (num + 1) * array->elem_size;
-               void *nlist;
-               if (snd_BUG_ON(num >= 4096))
-                       return NULL;
-               nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO);
-               if (!nlist)
-                       return NULL;
-               array->list = nlist;
-               array->alloced = num;
-       }
-       return snd_array_elem(array, array->used++);
-}
-EXPORT_SYMBOL_GPL(snd_array_new);
-
-/**
- * snd_array_free - free the given array elements
- * @array: the array object
- */
-void snd_array_free(struct snd_array *array)
-{
-       kfree(array->list);
-       array->used = 0;
-       array->alloced = 0;
-       array->list = NULL;
-}
-EXPORT_SYMBOL_GPL(snd_array_free);
-
 /**
  * snd_print_pcm_bits - Print the supported PCM fmt bits to the string buffer
  * @pcm: PCM caps bits

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 76776164623de006f7c48ca66489594d1e703543..3068163b3db2b40a7a1ad8fa4d682110b517dca4 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -29,36 +29,6 @@
 #include <sound/hdaudio.h>
 #include <sound/hda_verbs.h>
 
-/*
- * generic arrays
- */
-struct snd_array {
-       unsigned int used;
-       unsigned int alloced;
-       unsigned int elem_size;
-       unsigned int alloc_align;
-       void *list;
-};
-
-void *snd_array_new(struct snd_array *array);
-void snd_array_free(struct snd_array *array);
-static inline void snd_array_init(struct snd_array *array, unsigned int size,
-                                 unsigned int align)
-{
-       array->elem_size = size;
-       array->alloc_align = align;
-}
-
-static inline void *snd_array_elem(struct snd_array *array, unsigned int idx)
-{
-       return array->list + idx * array->elem_size;
-}
-
-static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)
-{
-       return (unsigned long)(ptr - array->list) / array->elem_size;
-}
-
 /*
  * Structures
  */