Commit f9a6bb84 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: Fix assignment in if condition 

There are lots of places doing assignments in if condition in ALSA
sequencer core, which is a bad coding style that may confuse readers
and occasionally lead to bugs.

This patch is merely for coding-style fixes, no functional changes.

Link: https://lore.kernel.org/r/20210608140540.17885-57-tiwai@suse.de


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

sound/core/seq/oss/seq_oss.c

+16 −10
Original line number Diff line number Diff line
@@ -67,13 +67,16 @@ static int __init alsa_seq_oss_init(void) 
{

	int rc;



	if ((rc = register_device()) < 0)

	rc = register_device();

	if (rc < 0)

		goto error;

	if ((rc = register_proc()) < 0) {

	rc = register_proc();

	if (rc < 0) {

		unregister_device();

		goto error;

	}

	if ((rc = snd_seq_oss_create_client()) < 0) {

	rc = snd_seq_oss_create_client();

	if (rc < 0) {

		unregister_proc();

		unregister_device();

		goto error;
@@ -133,7 +136,8 @@ odev_release(struct inode *inode, struct file *file) 
{

	struct seq_oss_devinfo *dp;



	if ((dp = file->private_data) == NULL)

	dp = file->private_data;

	if (!dp)

		return 0;



	mutex_lock(&register_mutex);
@@ -226,16 +230,18 @@ register_device(void) 
	int rc;



	mutex_lock(&register_mutex);

	if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,

	rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,

				     NULL, 0,

					  &seq_oss_f_ops, NULL)) < 0) {

				     &seq_oss_f_ops, NULL);

	if (rc < 0) {

		pr_err("ALSA: seq_oss: can't register device seq\n");

		mutex_unlock(&register_mutex);

		return rc;

	}

	if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,

	rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,

				     NULL, 0,

					  &seq_oss_f_ops, NULL)) < 0) {

				     &seq_oss_f_ops, NULL);

	if (rc < 0) {

		pr_err("ALSA: seq_oss: can't register device music\n");

		snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0);

		mutex_unlock(&register_mutex);

sound/core/seq/oss/seq_oss_init.c

+6 −3
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ snd_seq_oss_create_client(void) 
	port->kernel = &port_callback;

	

	call_ctl(SNDRV_SEQ_IOCTL_CREATE_PORT, port);

	if ((system_port = port->addr.port) >= 0) {

	system_port = port->addr.port;

	if (system_port >= 0) {

		struct snd_seq_port_subscribe subs;



		memset(&subs, 0, sizeof(subs));
@@ -354,7 +355,8 @@ alloc_seq_queue(struct seq_oss_devinfo *dp) 
	qinfo.owner = system_client;

	qinfo.locked = 1;

	strcpy(qinfo.name, "OSS Sequencer Emulation");

	if ((rc = call_ctl(SNDRV_SEQ_IOCTL_CREATE_QUEUE, &qinfo)) < 0)

	rc = call_ctl(SNDRV_SEQ_IOCTL_CREATE_QUEUE, &qinfo);

	if (rc < 0)

		return rc;

	dp->queue = qinfo.queue;

	return 0;
@@ -485,7 +487,8 @@ snd_seq_oss_system_info_read(struct snd_info_buffer *buf) 
	snd_iprintf(buf, "\nNumber of applications: %d\n", num_clients);

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

		snd_iprintf(buf, "\nApplication %d: ", i);

		if ((dp = client_table[i]) == NULL) {

		dp = client_table[i];

		if (!dp) {

			snd_iprintf(buf, "*empty*\n");

			continue;

		}

sound/core/seq/oss/seq_oss_midi.c

+22 −11
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo) 
	/*

	 * look for the identical slot

	 */

	if ((mdev = find_slot(pinfo->addr.client, pinfo->addr.port)) != NULL) {

	mdev = find_slot(pinfo->addr.client, pinfo->addr.port);

	if (mdev) {

		/* already exists */

		snd_use_lock_free(&mdev->use_lock);

		return 0;
@@ -218,7 +219,8 @@ snd_seq_oss_midi_check_exit_port(int client, int port) 
	unsigned long flags;

	int index;



	if ((mdev = find_slot(client, port)) != NULL) {

	mdev = find_slot(client, port);

	if (mdev) {

		spin_lock_irqsave(&register_lock, flags);

		midi_devs[mdev->seq_device] = NULL;

		spin_unlock_irqrestore(&register_lock, flags);
@@ -250,7 +252,8 @@ snd_seq_oss_midi_clear_all(void) 


	spin_lock_irqsave(&register_lock, flags);

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

		if ((mdev = midi_devs[i]) != NULL) {

		mdev = midi_devs[i];

		if (mdev) {

			snd_midi_event_free(mdev->coder);

			kfree(mdev);

			midi_devs[i] = NULL;
@@ -318,7 +321,8 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode) 
	struct seq_oss_midi *mdev;

	struct snd_seq_port_subscribe subs;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return -ENODEV;



	/* already used? */
@@ -384,7 +388,8 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev) 
	struct seq_oss_midi *mdev;

	struct snd_seq_port_subscribe subs;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return -ENODEV;

	if (! mdev->opened || mdev->devinfo != dp) {

		snd_use_lock_free(&mdev->use_lock);
@@ -421,7 +426,8 @@ snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev) 
	struct seq_oss_midi *mdev;

	int mode;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return 0;



	mode = 0;
@@ -443,7 +449,8 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev) 
{

	struct seq_oss_midi *mdev;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return;

	if (! mdev->opened) {

		snd_use_lock_free(&mdev->use_lock);
@@ -491,7 +498,8 @@ snd_seq_oss_midi_get_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_ad 
{

	struct seq_oss_midi *mdev;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return;

	addr->client = mdev->client;

	addr->port = mdev->port;
@@ -511,7 +519,8 @@ snd_seq_oss_midi_input(struct snd_seq_event *ev, int direct, void *private_data) 


	if (dp->readq == NULL)

		return 0;

	if ((mdev = find_slot(ev->source.client, ev->source.port)) == NULL)

	mdev = find_slot(ev->source.client, ev->source.port);

	if (!mdev)

		return 0;

	if (! (mdev->opened & PERM_READ)) {

		snd_use_lock_free(&mdev->use_lock);
@@ -623,7 +632,8 @@ snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, stru 
{

	struct seq_oss_midi *mdev;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return -ENODEV;

	if (snd_midi_event_encode_byte(mdev->coder, c, ev)) {

		snd_seq_oss_fill_addr(dp, ev, mdev->client, mdev->port);
@@ -642,7 +652,8 @@ snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info 
{

	struct seq_oss_midi *mdev;



	if ((mdev = get_mididev(dp, dev)) == NULL)

	mdev = get_mididev(dp, dev);

	if (!mdev)

		return -ENXIO;

	inf->device = dev;

	inf->dev_type = 0; /* FIXME: ?? */

sound/core/seq/oss/seq_oss_rw.c

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int count, 
		}



		/* insert queue */

		if ((err = insert_queue(dp, &rec, opt)) < 0)

		err = insert_queue(dp, &rec, opt);

		if (err < 0)

			break;



		result += ev_size;

sound/core/seq/oss/seq_oss_synth.c

+6 −3
Original line number Diff line number Diff line
@@ -451,7 +451,8 @@ snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt, 


	if (info->is_midi)

		return 0;

	if ((rec = get_synthdev(dp, dev)) == NULL)

	rec = get_synthdev(dp, dev);

	if (!rec)

		return -ENXIO;



	if (rec->oper.load_patch == NULL)
@@ -569,7 +570,8 @@ snd_seq_oss_synth_ioctl(struct seq_oss_devinfo *dp, int dev, unsigned int cmd, u 
	info = get_synthinfo_nospec(dp, dev);

	if (!info || info->is_midi)

		return -ENXIO;

	if ((rec = get_synthdev(dp, dev)) == NULL)

	rec = get_synthdev(dp, dev);

	if (!rec)

		return -ENXIO;

	if (rec->oper.ioctl == NULL)

		rc = -ENXIO;
@@ -619,7 +621,8 @@ snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_in 
		inf->device = dev;

		strscpy(inf->name, minf.name, sizeof(inf->name));

	} else {

		if ((rec = get_synthdev(dp, dev)) == NULL)

		rec = get_synthdev(dp, dev);

		if (!rec)

			return -ENXIO;

		inf->synth_type = rec->synth_type;

		inf->synth_subtype = rec->synth_subtype;