Commit 316e38ef authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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



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: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240222111509.28390-9-tiwai@suse.de
parent 5d04ad53

sound/core/seq/seq_ump_client.c

+12 −21
Original line number Diff line number Diff line
@@ -217,15 +217,12 @@ static void fill_port_info(struct snd_seq_port_info *port, 
static int seq_ump_group_init(struct seq_ump_client *client, int group_index)

{

	struct seq_ump_group *group = &client->groups[group_index];

	struct snd_seq_port_info *port;

	struct snd_seq_port_info *port __free(kfree) = NULL;

	struct snd_seq_port_callback pcallbacks;

	int err;



	port = kzalloc(sizeof(*port), GFP_KERNEL);

	if (!port) {

		err = -ENOMEM;

		goto error;

	}

	if (!port)

		return -ENOMEM;



	fill_port_info(port, client, group);

	port->flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT;
@@ -238,24 +235,22 @@ static int seq_ump_group_init(struct seq_ump_client *client, int group_index) 
	pcallbacks.unuse = seq_ump_unuse;

	pcallbacks.event_input = seq_ump_process_event;

	port->kernel = &pcallbacks;

	err = snd_seq_kernel_client_ctl(client->seq_client,

	return snd_seq_kernel_client_ctl(client->seq_client,

					 SNDRV_SEQ_IOCTL_CREATE_PORT,

					 port);

 error:

	kfree(port);

	return err;

}



/* update the sequencer ports; called from notify_fb_change callback */

static void update_port_infos(struct seq_ump_client *client)

{

	struct snd_seq_port_info *old, *new;

	struct snd_seq_port_info *old __free(kfree) = NULL;

	struct snd_seq_port_info *new __free(kfree) = NULL;

	int i, err;



	old = kzalloc(sizeof(*old), GFP_KERNEL);

	new = kzalloc(sizeof(*new), GFP_KERNEL);

	if (!old || !new)

		goto error;

		return;



	for (i = 0; i < SNDRV_UMP_MAX_GROUPS; i++) {

		old->addr.client = client->seq_client;
@@ -264,7 +259,7 @@ static void update_port_infos(struct seq_ump_client *client) 
						SNDRV_SEQ_IOCTL_GET_PORT_INFO,

						old);

		if (err < 0)

			goto error;

			return;

		fill_port_info(new, client, &client->groups[i]);

		if (old->capability == new->capability &&

		    !strcmp(old->name, new->name))
@@ -273,13 +268,10 @@ static void update_port_infos(struct seq_ump_client *client) 
						SNDRV_SEQ_IOCTL_SET_PORT_INFO,

						new);

		if (err < 0)

			goto error;

			return;

		/* notify to system port */

		snd_seq_system_client_ev_port_change(client->seq_client, i);

	}

 error:

	kfree(new);

	kfree(old);

}



/* update dir_bits and active flag for all groups in the client */
@@ -334,7 +326,7 @@ static void update_group_attrs(struct seq_ump_client *client) 
/* create a UMP Endpoint port */

static int create_ump_endpoint_port(struct seq_ump_client *client)

{

	struct snd_seq_port_info *port;

	struct snd_seq_port_info *port __free(kfree) = NULL;

	struct snd_seq_port_callback pcallbacks;

	unsigned int rawmidi_info = client->ump->core.info_flags;

	int err;
@@ -383,7 +375,6 @@ static int create_ump_endpoint_port(struct seq_ump_client *client) 
	err = snd_seq_kernel_client_ctl(client->seq_client,

					SNDRV_SEQ_IOCTL_CREATE_PORT,

					port);

	kfree(port);

	return err;

}