iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: seq: oss: Use automatic cleanup of kfree()

Browse Source 
There are common patterns where a temporary buffer is allocated and
freed at the exit, and those can be simplified with the recent cleanup
mechanism via __free(kfree).

No functional changes, only code refactoring.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240222111509.28390-7-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2024-02-22 12:15:06 +01:00
parent fb9e197f3f
commit 1c4025d4ea
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/core/seq/oss/seq_oss_init.c
View File

@ -63,20 +63,18 @@ int __init
snd_seq_oss_create_client(void) snd_seq_oss_create_client(void)
{ {
int rc; int rc;
struct snd_seq_port_info *port; struct snd_seq_port_info *port __free(kfree) = NULL;
struct snd_seq_port_callback port_callback; struct snd_seq_port_callback port_callback;
port = kzalloc(sizeof(*port), GFP_KERNEL); port = kzalloc(sizeof(*port), GFP_KERNEL);
if (!port) { if (!port)
rc = -ENOMEM; return -ENOMEM;
goto __error;
}
/* create ALSA client */ /* create ALSA client */
rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS, rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS,
"OSS sequencer"); "OSS sequencer");
if (rc < 0) if (rc < 0)
goto __error; return rc;
system_client = rc; system_client = rc;
@ -104,14 +102,11 @@ snd_seq_oss_create_client(void)
subs.dest.port = system_port; subs.dest.port = system_port;
call_ctl(SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, &subs); call_ctl(SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, &subs);
} }
rc = 0;
/* look up midi devices */ /* look up midi devices */
schedule_work(&async_lookup_work); schedule_work(&async_lookup_work);
__error: return 0;
kfree(port);
return rc;
} }

11
sound/core/seq/oss/seq_oss_midi.c
View File

@ -64,16 +64,13 @@ static int send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,
int int
snd_seq_oss_midi_lookup_ports(int client) snd_seq_oss_midi_lookup_ports(int client)
{ {
struct snd_seq_client_info *clinfo; struct snd_seq_client_info *clinfo __free(kfree) = NULL;
struct snd_seq_port_info *pinfo; struct snd_seq_port_info *pinfo __free(kfree) = NULL;
clinfo = kzalloc(sizeof(*clinfo), GFP_KERNEL); clinfo = kzalloc(sizeof(*clinfo), GFP_KERNEL);
pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL); pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL);
if (! clinfo || ! pinfo) { if (!clinfo || !pinfo)
kfree(clinfo);
kfree(pinfo);
return -ENOMEM; return -ENOMEM;
}
clinfo->client = -1; clinfo->client = -1;
while (snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT, clinfo) == 0) { while (snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT, clinfo) == 0) {
if (clinfo->client == client) if (clinfo->client == client)
@ -83,8 +80,6 @@ snd_seq_oss_midi_lookup_ports(int client)
while (snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, pinfo) == 0) while (snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, pinfo) == 0)
snd_seq_oss_midi_check_new_port(pinfo); snd_seq_oss_midi_check_new_port(pinfo);
} }
kfree(clinfo);
kfree(pinfo);
return 0; return 0;
} }