Commit c308bb41 authored by Thorsten Blum's avatar Thorsten Blum Committed by Takashi Iwai
Browse files

ALSA: hda: Use min() to simplify snd_hda_get_devices() 



Use min() to simplify snd_hda_get_devices() and improve its readability.

Change the function parameter 'max_devices' from 'int' to 'unsigned int'
to avoid a min() signedness error. Update all related local variables
and the function's return type to 'unsigned int' accordingly.

No functional changes intended.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Link: https://patch.msgid.link/20250813205507.215658-2-thorsten.blum@linux.dev


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 113e9a28

include/sound/hda_codec.h

+2 −2
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums, 
int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,

			   hda_nid_t nid, int recursive);

unsigned int snd_hda_get_num_devices(struct hda_codec *codec, hda_nid_t nid);

int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,

			u8 *dev_list, int max_devices);

unsigned int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,

				u8 *dev_list, unsigned int max_devices);

int snd_hda_get_dev_select(struct hda_codec *codec, hda_nid_t nid);

int snd_hda_set_dev_select(struct hda_codec *codec, hda_nid_t nid, int dev_id);

sound/hda/common/codec.c

+5 −6
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/minmax.h>

#include <linux/mutex.h>

#include <linux/module.h>

#include <linux/pm.h>
@@ -323,18 +324,16 @@ EXPORT_SYMBOL_GPL(snd_hda_get_num_devices); 
 * Copy the device list. This info is dynamic and so not cached.

 * Currently called only from hda_proc.c, so not exported.

 */

int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,

			u8 *dev_list, int max_devices)

unsigned int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,

				u8 *dev_list, unsigned int max_devices)

{

	unsigned int parm;

	int i, dev_len, devices;

	unsigned int parm, i, dev_len, devices;



	parm = snd_hda_get_num_devices(codec, nid);

	if (!parm)	/* not multi-stream capable */

		return 0;



	dev_len = parm + 1;

	dev_len = dev_len < max_devices ? dev_len : max_devices;

	dev_len = min(parm + 1, max_devices);



	devices = 0;

	while (devices < dev_len) {