Merge branch 'for-next' into topic/hda-core

1 files changed, 29 insertions, 17 deletions

diff --git a/include/sound/seq_device.h b/include/sound/seq_device.h
index 2b5f24cc7548..ddc0d504cf39 100644
--- a/include/sound/seq_device.h
+++ b/include/sound/seq_device.h
@@ -25,29 +25,26 @@
  * 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;
 };
 
+#define to_seq_dev(_dev) \
+        container_of(_dev, struct snd_seq_device, dev)
+
+/* sequencer driver */
 
 /* driver operators
- * init_device:
+ * probe:
  *      Initialize the device with given parameters.
  *      Typically,
  *              1. call snd_hwdep_new
@@ -55,25 +52,40 @@ struct snd_seq_device {
  *              3. call snd_hwdep_register
  *              4. store the instance to dev->driver_data pointer.
  *              
- * free_device:
+ * remove:
  *      Release the private data.
  *      Typically, call snd_device_free(dev->card, dev->driver_data)
  */
-struct snd_seq_dev_ops {
-        int (*init_device)(struct snd_seq_device *dev);
-        int (*free_device)(struct snd_seq_device *dev);
+struct snd_seq_driver {
+        struct device_driver driver;
+        char *id;
+        int argsize;
 };
 
+#define to_seq_drv(_drv) \
+        container_of(_drv, struct snd_seq_driver, driver)
+
 /*
  * prototypes
  */
+#ifdef CONFIG_MODULES
 void snd_seq_device_load_drivers(void);
-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);
+#else
+#define snd_seq_device_load_drivers()
+#endif
+int snd_seq_device_new(struct snd_card *card, int device, const char *id,
+                       int argsize, struct snd_seq_device **result);
 
 #define SNDRV_SEQ_DEVICE_ARGPTR(dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device))
 
+int __must_check __snd_seq_driver_register(struct snd_seq_driver *drv,
+                                           struct module *mod);
+#define snd_seq_driver_register(drv) \
+        __snd_seq_driver_register(drv, THIS_MODULE)
+void snd_seq_driver_unregister(struct snd_seq_driver *drv);
+
+#define module_snd_seq_driver(drv) \
+        module_driver(drv, snd_seq_driver_register, snd_seq_driver_unregister)
 
 /*
  * id strings for generic devices