aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/seq_device.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-02-12 13:40:50 +0100
committerTakashi Iwai <tiwai@suse.de>2015-02-12 14:13:47 +0100
commitaf03c243a1f014145dae34368fe975b2f08ed964 (patch)
tree1f414301b2d7ea0a4e074e191c22dc88278cb2ab /include/sound/seq_device.h
parentALSA: seq: Rewrite sequencer device binding with standard bus (diff)
downloadlinux-dev-af03c243a1f014145dae34368fe975b2f08ed964.tar.xz
linux-dev-af03c243a1f014145dae34368fe975b2f08ed964.zip
ALSA: seq: Clean up device and driver structs
Use const string pointer instead of copying the id string to each object. Also drop the status and list fields of snd_seq_device struct that are no longer used. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/seq_device.h')
-rw-r--r--include/sound/seq_device.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/include/sound/seq_device.h b/include/sound/seq_device.h
index ea256b825146..b13cd2930d32 100644
--- a/include/sound/seq_device.h
+++ b/include/sound/seq_device.h
@@ -25,24 +25,16 @@
* registered device information
*/
-#define ID_LEN 32
-
-/* status flag */
-#define SNDRV_SEQ_DEVICE_FREE 0
-#define SNDRV_SEQ_DEVICE_REGISTERED 1
-
struct snd_seq_device {
/* device info */
struct snd_card *card; /* sound card */
int device; /* device number */
- char id[ID_LEN]; /* driver id */
+ const char *id; /* driver id */
char name[80]; /* device name */
int argsize; /* size of the argument */
void *driver_data; /* private data for driver */
- int status; /* flag - read only */
void *private_data; /* private data for the caller */
void (*private_free)(struct snd_seq_device *device);
- struct list_head list; /* link to next device */
struct device dev;
};
@@ -75,9 +67,11 @@ void snd_seq_device_load_drivers(void);
#else
#define snd_seq_device_load_drivers()
#endif
-int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize, struct snd_seq_device **result);
-int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry, int argsize);
-int snd_seq_device_unregister_driver(char *id);
+int snd_seq_device_new(struct snd_card *card, int device, const char *id,
+ int argsize, struct snd_seq_device **result);
+int snd_seq_device_register_driver(const char *id,
+ struct snd_seq_dev_ops *entry, int argsize);
+int snd_seq_device_unregister_driver(const char *id);
#define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device))