superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: seq: Use bus specific probe and remove 

Introduce a bus specific probe and remove function. For now this only
allows to get rid of a cast of the generic device to an snd_seq device
in the drivers and changes the remove prototype to return void---a
non-zero return value is ignored anyhow.

The objective is to get rid of users of struct device callbacks
.probe(), .remove() and .shutdown() to eventually remove these. Until
all snd_seq drivers are converted this results in a runtime warning
about the drivers needing an update because there is a bus probe
function and a driver probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/f36b01b297fc5cbb6d0ed4959143add0c13eec99.1765283601.git.u.kleine-koenig@baylibre.com
master
Uwe Kleine-König 2025-12-09 13:38:43 +01:00 committed by Takashi Iwai
parent 8f0b4cce44
commit a89f7f0818
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/seq_device.h
View File

@ -43,6 +43,8 @@ struct snd_seq_device {
* Typically, call snd_device_free(dev->card, dev->driver_data)
*/
struct snd_seq_driver {
int (*probe)(struct snd_seq_device *dev);
void (*remove)(struct snd_seq_device *dev);
struct device_driver driver;
char *id;
int argsize;

47
sound/core/seq_device.c
View File

@ -49,9 +49,31 @@ static int snd_seq_bus_match(struct device *dev, const struct device_driver *drv
sdrv->argsize == sdev->argsize;
}
static int snd_seq_bus_probe(struct device *dev)
{
struct snd_seq_device *sdev = to_seq_dev(dev);
const struct snd_seq_driver *sdrv = to_seq_drv(dev->driver);
if (sdrv->probe)
return sdrv->probe(sdev);
else
return 0;
}
static void snd_seq_bus_remove(struct device *dev)
{
struct snd_seq_device *sdev = to_seq_dev(dev);
const struct snd_seq_driver *sdrv = to_seq_drv(dev->driver);
if (sdrv->remove)
sdrv->remove(sdev);
}
static const struct bus_type snd_seq_bus_type = {
.name = "snd_seq",
.match = snd_seq_bus_match,
.probe = snd_seq_bus_probe,
.remove = snd_seq_bus_remove,
};
/*
@ -242,6 +264,25 @@ int snd_seq_device_new(struct snd_card *card, int device, const char *id,
}
EXPORT_SYMBOL(snd_seq_device_new);
static int snd_seq_driver_legacy_probe(struct snd_seq_device *sdev)
{
struct device *dev = &sdev->dev;
struct device_driver *driver = dev->driver;
return driver->probe(dev);
}
static void snd_seq_driver_legacy_remove(struct snd_seq_device *sdev)
{
struct device *dev = &sdev->dev;
struct device_driver *driver = dev->driver;
int ret;
ret = driver->remove(dev);
if (unlikely(ret))
dev_warn(dev, "Ignoring return value of remove callback (%pe)\n", ERR_PTR(ret));
}
/*
* driver registration
*/
@ -251,6 +292,12 @@ int __snd_seq_driver_register(struct snd_seq_driver *drv, struct module *mod)
return -EINVAL;
drv->driver.bus = &snd_seq_bus_type;
drv->driver.owner = mod;
if (!drv->probe && drv->driver.probe)
drv->probe = snd_seq_driver_legacy_probe;
if (!drv->remove && drv->driver.remove)
drv->remove = snd_seq_driver_legacy_remove;
return driver_register(&drv->driver);
}
EXPORT_SYMBOL_GPL(__snd_seq_driver_register);