diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-03 11:33:10 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:19:35 -0400 |
| commit | 71fc4c7ef5ef2d0ddd22f0545ede4c135b554b84 (patch) | |
| tree | 2fad250a6c6f229aabd6b1aab41d24a50da511d9 /sound/hda | |
| parent | e311782acd196d17d25b323d115709c50c8f7d3f (diff) | |
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>
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/Makefile | 3 | ||||
| -rw-r--r-- | sound/hda/array.c | 49 |
2 files changed, 51 insertions, 1 deletions
diff --git a/sound/hda/Makefile b/sound/hda/Makefile index eec5da03b41f..e508ba1102cb 100644 --- a/sound/hda/Makefile +++ b/sound/hda/Makefile | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o | 1 | snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \ |
| 2 | array.o | ||
| 2 | 3 | ||
| 3 | snd-hda-core-objs += trace.o | 4 | snd-hda-core-objs += trace.o |
| 4 | CFLAGS_trace.o := -I$(src) | 5 | CFLAGS_trace.o := -I$(src) |
diff --git a/sound/hda/array.c b/sound/hda/array.c new file mode 100644 index 000000000000..516795baa7db --- /dev/null +++ b/sound/hda/array.c | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | /* | ||
| 2 | * generic arrays | ||
| 3 | */ | ||
| 4 | |||
| 5 | #include <linux/slab.h> | ||
| 6 | #include <sound/core.h> | ||
| 7 | #include <sound/hdaudio.h> | ||
| 8 | |||
| 9 | /** | ||
| 10 | * snd_array_new - get a new element from the given array | ||
| 11 | * @array: the array object | ||
| 12 | * | ||
| 13 | * Get a new element from the given array. If it exceeds the | ||
| 14 | * pre-allocated array size, re-allocate the array. | ||
| 15 | * | ||
| 16 | * Returns NULL if allocation failed. | ||
| 17 | */ | ||
| 18 | void *snd_array_new(struct snd_array *array) | ||
| 19 | { | ||
| 20 | if (snd_BUG_ON(!array->elem_size)) | ||
| 21 | return NULL; | ||
| 22 | if (array->used >= array->alloced) { | ||
| 23 | int num = array->alloced + array->alloc_align; | ||
| 24 | int size = (num + 1) * array->elem_size; | ||
| 25 | void *nlist; | ||
| 26 | if (snd_BUG_ON(num >= 4096)) | ||
| 27 | return NULL; | ||
| 28 | nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO); | ||
| 29 | if (!nlist) | ||
| 30 | return NULL; | ||
| 31 | array->list = nlist; | ||
| 32 | array->alloced = num; | ||
| 33 | } | ||
| 34 | return snd_array_elem(array, array->used++); | ||
| 35 | } | ||
| 36 | EXPORT_SYMBOL_GPL(snd_array_new); | ||
| 37 | |||
| 38 | /** | ||
| 39 | * snd_array_free - free the given array elements | ||
| 40 | * @array: the array object | ||
| 41 | */ | ||
| 42 | void snd_array_free(struct snd_array *array) | ||
| 43 | { | ||
| 44 | kfree(array->list); | ||
| 45 | array->used = 0; | ||
| 46 | array->alloced = 0; | ||
| 47 | array->list = NULL; | ||
| 48 | } | ||
| 49 | EXPORT_SYMBOL_GPL(snd_array_free); | ||
