From: Uwe Kleine-König Date: Tue, 9 Dec 2025 12:38:47 +0000 (+0100) Subject: ALSA: opl4: Convert to snd_seq bus probe mechanism X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=505b57e52c9eeef810df23af6064aeb79b601f00;p=thirdparty%2Fkernel%2Flinux.git ALSA: opl4: Convert to snd_seq bus probe mechanism The snd_seq bus got a dedicated probe function. Make use of that. This fixes a runtime warning about the driver needing to be converted to the bus probe method. Signed-off-by: Uwe Kleine-König Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/15cd19c9c8ec32e92b956eec112e515335bc22cf.1765283601.git.u.kleine-koenig@baylibre.com --- diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c index 7bb22089a0934..fd6f15be6109e 100644 --- a/sound/drivers/opl4/opl4_seq.c +++ b/sound/drivers/opl4/opl4_seq.c @@ -118,9 +118,8 @@ static void snd_opl4_seq_free_port(void *private_data) snd_midi_channel_free_set(opl4->chset); } -static int snd_opl4_seq_probe(struct device *_dev) +static int snd_opl4_seq_probe(struct snd_seq_device *dev) { - struct snd_seq_device *dev = to_seq_dev(_dev); struct snd_opl4 *opl4; int client; struct snd_seq_port_callback pcallbacks; @@ -175,27 +174,25 @@ static int snd_opl4_seq_probe(struct device *_dev) return 0; } -static int snd_opl4_seq_remove(struct device *_dev) +static void snd_opl4_seq_remove(struct snd_seq_device *dev) { - struct snd_seq_device *dev = to_seq_dev(_dev); struct snd_opl4 *opl4; opl4 = *(struct snd_opl4 **)SNDRV_SEQ_DEVICE_ARGPTR(dev); if (!opl4) - return -EINVAL; + return; if (opl4->seq_client >= 0) { snd_seq_delete_kernel_client(opl4->seq_client); opl4->seq_client = -1; } - return 0; } static struct snd_seq_driver opl4_seq_driver = { + .probe = snd_opl4_seq_probe, + .remove = snd_opl4_seq_remove, .driver = { .name = KBUILD_MODNAME, - .probe = snd_opl4_seq_probe, - .remove = snd_opl4_seq_remove, }, .id = SNDRV_SEQ_DEV_ID_OPL4, .argsize = sizeof(struct snd_opl4 *),