redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: seq: Define driver object in each driver 

This patch moves the driver object initialization and allocation to
each driver's module init/exit code like other normal drivers.  The
snd_seq_driver struct is now published in seq_device.h, and each
driver is responsible to define it with proper driver attributes
(name, probe and remove) with snd_seq_driver specific attributes as id
and argsize fields.  The helper functions snd_seq_driver_register(),
snd_seq_driver_unregister() and module_snd_seq_driver() are used for
simplifying codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Takashi Iwai 2015-02-12 13:43:22 +01:00
parent af03c243a1
commit 056622053b
10 changed files with 122 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/sound/seq_device.h
View File

@ -41,8 +41,10 @@ struct snd_seq_device {
#define to_seq_dev(_dev) \ #define to_seq_dev(_dev) \
container_of(_dev, struct snd_seq_device, dev) container_of(_dev, struct snd_seq_device, dev)
/* sequencer driver */
/* driver operators /* driver operators
* init_device: * probe:
* Initialize the device with given parameters. * Initialize the device with given parameters.
* Typically, * Typically,
* 1. call snd_hwdep_new * 1. call snd_hwdep_new
@ -50,15 +52,19 @@ struct snd_seq_device {
* 3. call snd_hwdep_register * 3. call snd_hwdep_register
* 4. store the instance to dev->driver_data pointer. * 4. store the instance to dev->driver_data pointer.
* *
* free_device: * remove:
* Release the private data. * Release the private data.
* Typically, call snd_device_free(dev->card, dev->driver_data) * Typically, call snd_device_free(dev->card, dev->driver_data)
*/ */
struct snd_seq_dev_ops { struct snd_seq_driver {
int (*init_device)(struct snd_seq_device *dev); struct device_driver driver;
int (*free_device)(struct snd_seq_device *dev); char *id;
int argsize;
}; };
#define to_seq_drv(_drv) \
container_of(_drv, struct snd_seq_driver, driver)
/* /*
* prototypes * prototypes
*/ */
@ -69,12 +75,17 @@ void snd_seq_device_load_drivers(void);
#endif #endif
int snd_seq_device_new(struct snd_card *card, int device, const char *id, int snd_seq_device_new(struct snd_card *card, int device, const char *id,
int argsize, struct snd_seq_device **result); 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)) #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 * id strings for generic devices

20
sound/core/seq/oss/seq_oss.c
View File

@ -65,13 +65,19 @@ static unsigned int odev_poll(struct file *file, poll_table * wait);
* module interface * module interface
*/ */
static struct snd_seq_driver seq_oss_synth_driver = {
.driver = {
.name = KBUILD_MODNAME,
.probe = snd_seq_oss_synth_probe,
.remove = snd_seq_oss_synth_remove,
},
.id = SNDRV_SEQ_DEV_ID_OSS,
.argsize = sizeof(struct snd_seq_oss_reg),
};
static int __init alsa_seq_oss_init(void) static int __init alsa_seq_oss_init(void)
{ {
int rc; int rc;
static struct snd_seq_dev_ops ops = {
snd_seq_oss_synth_register,
snd_seq_oss_synth_unregister,
};
snd_seq_autoload_lock(); snd_seq_autoload_lock();
if ((rc = register_device()) < 0) if ((rc = register_device()) < 0)
@ -86,8 +92,8 @@ static int __init alsa_seq_oss_init(void)
goto error; goto error;
} }
if ((rc = snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OSS, &ops, rc = snd_seq_driver_register(&seq_oss_synth_driver);
sizeof(struct snd_seq_oss_reg))) < 0) { if (rc < 0) {
snd_seq_oss_delete_client(); snd_seq_oss_delete_client();
unregister_proc(); unregister_proc();
unregister_device(); unregister_device();
@ -104,7 +110,7 @@ static int __init alsa_seq_oss_init(void)
static void __exit alsa_seq_oss_exit(void) static void __exit alsa_seq_oss_exit(void)
{ {
snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OSS); snd_seq_driver_unregister(&seq_oss_synth_driver);
snd_seq_oss_delete_client(); snd_seq_oss_delete_client();
unregister_proc(); unregister_proc();
unregister_device(); unregister_device();

6
sound/core/seq/oss/seq_oss_synth.c
View File

@ -98,8 +98,9 @@ snd_seq_oss_synth_init(void)
* registration of the synth device * registration of the synth device
*/ */
int int
snd_seq_oss_synth_register(struct snd_seq_device *dev) snd_seq_oss_synth_probe(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
int i; int i;
struct seq_oss_synth *rec; struct seq_oss_synth *rec;
struct snd_seq_oss_reg *reg = SNDRV_SEQ_DEVICE_ARGPTR(dev); struct snd_seq_oss_reg *reg = SNDRV_SEQ_DEVICE_ARGPTR(dev);
@ -149,8 +150,9 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev)
int int
snd_seq_oss_synth_unregister(struct snd_seq_device *dev) snd_seq_oss_synth_remove(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
int index; int index;
struct seq_oss_synth *rec = dev->driver_data; struct seq_oss_synth *rec = dev->driver_data;
unsigned long flags; unsigned long flags;

4
sound/core/seq/oss/seq_oss_synth.h
View File

@ -28,8 +28,8 @@
#include <sound/seq_device.h> #include <sound/seq_device.h>
void snd_seq_oss_synth_init(void); void snd_seq_oss_synth_init(void);
int snd_seq_oss_synth_register(struct snd_seq_device *dev); int snd_seq_oss_synth_probe(struct device *dev);
int snd_seq_oss_synth_unregister(struct snd_seq_device *dev); int snd_seq_oss_synth_remove(struct device *dev);
void snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp); void snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp);
void snd_seq_oss_synth_setup_midi(struct seq_oss_devinfo *dp); void snd_seq_oss_synth_setup_midi(struct seq_oss_devinfo *dp);
void snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp); void snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp);

93
sound/core/seq/seq_device.c
View File

@ -52,16 +52,6 @@ MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
MODULE_DESCRIPTION("ALSA sequencer device management"); MODULE_DESCRIPTION("ALSA sequencer device management");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
struct snd_seq_driver {
struct device_driver driver;
const char *id;
int argsize;
struct snd_seq_dev_ops ops;
};
#define to_seq_drv(_drv) \
container_of(_drv, struct snd_seq_driver, driver)
/* /*
* bus definition * bus definition
*/ */
@ -263,86 +253,23 @@ int snd_seq_device_new(struct snd_card *card, int device, const char *id,
EXPORT_SYMBOL(snd_seq_device_new); EXPORT_SYMBOL(snd_seq_device_new);
/* /*
* driver binding - just pass to each driver callback * driver registration
*/ */
static int snd_seq_drv_probe(struct device *dev) int __snd_seq_driver_register(struct snd_seq_driver *drv, struct module *mod)
{ {
struct snd_seq_driver *sdrv = to_seq_drv(dev->driver); if (WARN_ON(!drv->driver.name || !drv->id))
struct snd_seq_device *sdev = to_seq_dev(dev);
return sdrv->ops.init_device(sdev);
}
static int snd_seq_drv_remove(struct device *dev)
{
struct snd_seq_driver *sdrv = to_seq_drv(dev->driver);
struct snd_seq_device *sdev = to_seq_dev(dev);
return sdrv->ops.free_device(sdev);
}
/*
* register device driver
* id = driver id
* entry = driver operators - duplicated to each instance
*/
int snd_seq_device_register_driver(const char *id,
struct snd_seq_dev_ops *entry, int argsize)
{
struct snd_seq_driver *sdrv;
int err;
if (id == NULL || entry == NULL ||
entry->init_device == NULL || entry->free_device == NULL)
return -EINVAL; return -EINVAL;
drv->driver.bus = &snd_seq_bus_type;
sdrv = kzalloc(sizeof(*sdrv), GFP_KERNEL); drv->driver.owner = mod;
if (!sdrv) return driver_register(&drv->driver);
return -ENOMEM;
sdrv->driver.name = id;
sdrv->driver.bus = &snd_seq_bus_type;
sdrv->driver.probe = snd_seq_drv_probe;
sdrv->driver.remove = snd_seq_drv_remove;
sdrv->id = id;
sdrv->argsize = argsize;
sdrv->ops = *entry;
err = driver_register(&sdrv->driver);
if (err < 0)
kfree(sdrv);
return err;
} }
EXPORT_SYMBOL(snd_seq_device_register_driver); EXPORT_SYMBOL_GPL(__snd_seq_driver_register);
/* callback to find a specific driver; data is a pointer to the id string ptr. void snd_seq_driver_unregister(struct snd_seq_driver *drv)
* when the id matches, store the driver pointer in return and break the loop.
*/
static int find_drv(struct device_driver *drv, void *data)
{ {
struct snd_seq_driver *sdrv = to_seq_drv(drv); driver_unregister(&drv->driver);
void **ptr = (void **)data;
if (strcmp(sdrv->id, *ptr))
return 0; /* id don't match, continue the loop */
*ptr = sdrv;
return 1; /* break the loop */
} }
EXPORT_SYMBOL_GPL(snd_seq_driver_unregister);
/*
* unregister the specified driver
*/
int snd_seq_device_unregister_driver(const char *id)
{
struct snd_seq_driver *sdrv = (struct snd_seq_driver *)id;
if (!bus_for_each_drv(&snd_seq_bus_type, NULL, &sdrv, find_drv))
return -ENXIO;
driver_unregister(&sdrv->driver);
kfree(sdrv);
return 0;
}
EXPORT_SYMBOL(snd_seq_device_unregister_driver);
/* /*
* module part * module part

28
sound/core/seq/seq_midi.c
View File

@ -273,8 +273,9 @@ static void snd_seq_midisynth_delete(struct seq_midisynth *msynth)
/* register new midi synth port */ /* register new midi synth port */
static int static int
snd_seq_midisynth_register_port(struct snd_seq_device *dev) snd_seq_midisynth_probe(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct seq_midisynth_client *client; struct seq_midisynth_client *client;
struct seq_midisynth *msynth, *ms; struct seq_midisynth *msynth, *ms;
struct snd_seq_port_info *port; struct snd_seq_port_info *port;
@ -427,8 +428,9 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)
/* release midi synth port */ /* release midi synth port */
static int static int
snd_seq_midisynth_unregister_port(struct snd_seq_device *dev) snd_seq_midisynth_remove(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct seq_midisynth_client *client; struct seq_midisynth_client *client;
struct seq_midisynth *msynth; struct seq_midisynth *msynth;
struct snd_card *card = dev->card; struct snd_card *card = dev->card;
@ -457,23 +459,29 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
return 0; return 0;
} }
static struct snd_seq_driver seq_midisynth_driver = {
.driver = {
.name = KBUILD_MODNAME,
.probe = snd_seq_midisynth_probe,
.remove = snd_seq_midisynth_remove,
},
.id = SNDRV_SEQ_DEV_ID_MIDISYNTH,
.argsize = 0,
};
static int __init alsa_seq_midi_init(void) static int __init alsa_seq_midi_init(void)
{ {
static struct snd_seq_dev_ops ops = { int err;
snd_seq_midisynth_register_port,
snd_seq_midisynth_unregister_port,
};
memset(&synths, 0, sizeof(synths));
snd_seq_autoload_lock(); snd_seq_autoload_lock();
snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_MIDISYNTH, &ops, 0); err = snd_seq_driver_register(&seq_midisynth_driver);
snd_seq_autoload_unlock(); snd_seq_autoload_unlock();
return 0; return err;
} }
static void __exit alsa_seq_midi_exit(void) static void __exit alsa_seq_midi_exit(void)
{ {
snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_MIDISYNTH); snd_seq_driver_unregister(&seq_midisynth_driver);
} }
module_init(alsa_seq_midi_init) module_init(alsa_seq_midi_init)

32
sound/drivers/opl3/opl3_seq.c
View File

@ -216,8 +216,9 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)
/* ------------------------------ */ /* ------------------------------ */
static int snd_opl3_seq_new_device(struct snd_seq_device *dev) static int snd_opl3_seq_probe(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
int client, err; int client, err;
char name[32]; char name[32];
@ -257,8 +258,9 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev)
return 0; return 0;
} }
static int snd_opl3_seq_delete_device(struct snd_seq_device *dev) static int snd_opl3_seq_remove(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev); opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
@ -275,22 +277,14 @@ static int snd_opl3_seq_delete_device(struct snd_seq_device *dev)
return 0; return 0;
} }
static int __init alsa_opl3_seq_init(void) static struct snd_seq_driver opl3_seq_driver = {
{ .driver = {
static struct snd_seq_dev_ops ops = .name = KBUILD_MODNAME,
{ .probe = snd_opl3_seq_probe,
snd_opl3_seq_new_device, .remove = snd_opl3_seq_remove,
snd_opl3_seq_delete_device },
.id = SNDRV_SEQ_DEV_ID_OPL3,
.argsize = sizeof(struct snd_opl3 *),
}; };
return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops, module_snd_seq_driver(opl3_seq_driver);
sizeof(struct snd_opl3 *));
}
static void __exit alsa_opl3_seq_exit(void)
{
snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OPL3);
}
module_init(alsa_opl3_seq_init)
module_exit(alsa_opl3_seq_exit)

31
sound/drivers/opl4/opl4_seq.c
View File

@ -124,8 +124,9 @@ static void snd_opl4_seq_free_port(void *private_data)
snd_midi_channel_free_set(opl4->chset); snd_midi_channel_free_set(opl4->chset);
} }
static int snd_opl4_seq_new_device(struct snd_seq_device *dev) static int snd_opl4_seq_probe(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_opl4 *opl4; struct snd_opl4 *opl4;
int client; int client;
struct snd_seq_port_callback pcallbacks; struct snd_seq_port_callback pcallbacks;
@ -180,8 +181,9 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev)
return 0; return 0;
} }
static int snd_opl4_seq_delete_device(struct snd_seq_device *dev) static int snd_opl4_seq_remove(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_opl4 *opl4; struct snd_opl4 *opl4;
opl4 = *(struct snd_opl4 **)SNDRV_SEQ_DEVICE_ARGPTR(dev); opl4 = *(struct snd_opl4 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);
@ -195,21 +197,14 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)
return 0; return 0;
} }
static int __init alsa_opl4_synth_init(void) static struct snd_seq_driver opl4_seq_driver = {
{ .driver = {
static struct snd_seq_dev_ops ops = { .name = KBUILD_MODNAME,
snd_opl4_seq_new_device, .probe = snd_opl4_seq_probe,
snd_opl4_seq_delete_device .remove = snd_opl4_seq_remove,
},
.id = SNDRV_SEQ_DEV_ID_OPL4,
.argsize = sizeof(struct snd_opl4 *),
}; };
return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops, module_snd_seq_driver(opl4_seq_driver);
sizeof(struct snd_opl4 *));
}
static void __exit alsa_opl4_synth_exit(void)
{
snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OPL4);
}
module_init(alsa_opl4_synth_init)
module_exit(alsa_opl4_synth_exit)

31
sound/isa/sb/emu8000_synth.c
View File

@ -34,8 +34,9 @@ MODULE_LICENSE("GPL");
/* /*
* create a new hardware dependent device for Emu8000 * create a new hardware dependent device for Emu8000
*/ */
static int snd_emu8000_new_device(struct snd_seq_device *dev) static int snd_emu8000_probe(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_emu8000 *hw; struct snd_emu8000 *hw;
struct snd_emux *emu; struct snd_emux *emu;
@ -93,8 +94,9 @@ static int snd_emu8000_new_device(struct snd_seq_device *dev)
/* /*
* free all resources * free all resources
*/ */
static int snd_emu8000_delete_device(struct snd_seq_device *dev) static int snd_emu8000_remove(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_emu8000 *hw; struct snd_emu8000 *hw;
if (dev->driver_data == NULL) if (dev->driver_data == NULL)
@ -114,21 +116,14 @@ static int snd_emu8000_delete_device(struct snd_seq_device *dev)
* INIT part * INIT part
*/ */
static int __init alsa_emu8000_init(void) static struct snd_seq_driver emu8000_driver = {
{ .driver = {
.name = KBUILD_MODNAME,
static struct snd_seq_dev_ops ops = { .probe = snd_emu8000_probe,
snd_emu8000_new_device, .remove = snd_emu8000_remove,
snd_emu8000_delete_device, },
.id = SNDRV_SEQ_DEV_ID_EMU8000,
.argsize = sizeof(struct snd_emu8000 *),
}; };
return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
sizeof(struct snd_emu8000*));
}
static void __exit alsa_emu8000_exit(void) module_snd_seq_driver(emu8000_driver);
{
snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_EMU8000);
}
module_init(alsa_emu8000_init)
module_exit(alsa_emu8000_exit)

31
sound/pci/emu10k1/emu10k1_synth.c
View File

@ -29,8 +29,9 @@ MODULE_LICENSE("GPL");
/* /*
* create a new hardware dependent device for Emu10k1 * create a new hardware dependent device for Emu10k1
*/ */
static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev) static int snd_emu10k1_synth_probe(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_emux *emux; struct snd_emux *emux;
struct snd_emu10k1 *hw; struct snd_emu10k1 *hw;
struct snd_emu10k1_synth_arg *arg; struct snd_emu10k1_synth_arg *arg;
@ -79,8 +80,9 @@ static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)
return 0; return 0;
} }
static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev) static int snd_emu10k1_synth_remove(struct device *_dev)
{ {
struct snd_seq_device *dev = to_seq_dev(_dev);
struct snd_emux *emux; struct snd_emux *emux;
struct snd_emu10k1 *hw; struct snd_emu10k1 *hw;
unsigned long flags; unsigned long flags;
@ -104,21 +106,14 @@ static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev)
* INIT part * INIT part
*/ */
static int __init alsa_emu10k1_synth_init(void) static struct snd_seq_driver emu10k1_synth_driver = {
{ .driver = {
.name = KBUILD_MODNAME,
static struct snd_seq_dev_ops ops = { .probe = snd_emu10k1_synth_probe,
snd_emu10k1_synth_new_device, .remove = snd_emu10k1_synth_remove,
snd_emu10k1_synth_delete_device, },
.id = SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
.argsize = sizeof(struct snd_emu10k1_synth_arg),
}; };
return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
sizeof(struct snd_emu10k1_synth_arg));
}
static void __exit alsa_emu10k1_synth_exit(void) module_snd_seq_driver(emu10k1_synth_driver);
{
snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH);
}
module_init(alsa_emu10k1_synth_init)
module_exit(alsa_emu10k1_synth_exit)