Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9842c38e authored by Stefani Seibold's avatar Stefani Seibold Committed by Linus Torvalds
Browse files

kfifo: fix warn_unused_result 



Fix the "ignoring return value of '...', declared with attribute
warn_unused_result" compiler warning in several users of the new kfifo
API.

It removes the __must_check attribute from kfifo_in() and
kfifo_in_locked() which must not necessary performed.

Fix the allocation bug in the nozomi driver file, by moving out the
kfifo_alloc from the interrupt handler into the probe function.

Fix the kfifo_out() and kfifo_out_locked() users to handle a unexpected
end of fifo.

Signed-off-by: default avatarStefani Seibold <stefani@seibold.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7acd72eb

drivers/char/nozomi.c

+27 −4
Original line number Diff line number Diff line
@@ -685,8 +685,6 @@ static int nozomi_read_config_table(struct nozomi *dc) 
		dump_table(dc);



		for (i = PORT_MDM; i < MAX_PORT; i++) {

			kfifo_alloc(&dc->port[i].fifo_ul,

				FIFO_BUFFER_SIZE_UL, GFP_ATOMIC);

			memset(&dc->port[i].ctrl_dl, 0, sizeof(struct ctrl_dl));

			memset(&dc->port[i].ctrl_ul, 0, sizeof(struct ctrl_ul));

		}
@@ -1433,6 +1431,16 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev, 
		goto err_free_sbuf;

	}



	for (i = PORT_MDM; i < MAX_PORT; i++) {

		if (kfifo_alloc(&dc->port[i].fifo_ul,

		      FIFO_BUFFER_SIZE_UL, GFP_ATOMIC)) {

			dev_err(&pdev->dev,

					"Could not allocate kfifo buffer\n");

			ret = -ENOMEM;

			goto err_free_kfifo;

		}

	}



	spin_lock_init(&dc->spin_mutex);



	nozomi_setup_private_data(dc);
@@ -1445,7 +1453,7 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev, 
			NOZOMI_NAME, dc);

	if (unlikely(ret)) {

		dev_err(&pdev->dev, "can't request irq %d\n", pdev->irq);

		goto err_free_sbuf;

		goto err_free_kfifo;

	}



	DBG1("base_addr: %p", dc->base_addr);
@@ -1464,13 +1472,28 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev, 
	dc->state = NOZOMI_STATE_ENABLED;



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

		struct device *tty_dev;



		mutex_init(&dc->port[i].tty_sem);

		tty_port_init(&dc->port[i].port);

		tty_register_device(ntty_driver, dc->index_start + i,

		tty_dev = tty_register_device(ntty_driver, dc->index_start + i,

							&pdev->dev);



		if (IS_ERR(tty_dev)) {

			ret = PTR_ERR(tty_dev);

			dev_err(&pdev->dev, "Could not allocate tty?\n");

			goto err_free_tty;

		}

	}



	return 0;



err_free_tty:

	for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)

		tty_unregister_device(ntty_driver, i);

err_free_kfifo:

	for (i = 0; i < MAX_PORT; i++)

		kfifo_free(&dc->port[i].fifo_ul);

err_free_sbuf:

	kfree(dc->send_buf);

	iounmap(dc->base_addr);

drivers/infiniband/hw/cxgb3/cxio_resource.c

+3 −2
Original line number Diff line number Diff line
@@ -86,8 +86,9 @@ static int __cxio_init_resource_fifo(struct kfifo *fifo, 
			kfifo_in(fifo, (unsigned char *) &i, sizeof(u32));



	for (i = 0; i < skip_low + skip_high; i++)

		kfifo_out_locked(fifo, (unsigned char *) &entry,

				sizeof(u32), fifo_lock);

		if (kfifo_out_locked(fifo, (unsigned char *) &entry,

				sizeof(u32), fifo_lock) != sizeof(u32))

					break;

	return 0;

}

drivers/media/video/meye.c

+3 −2
Original line number Diff line number Diff line
@@ -968,8 +968,9 @@ static int meyeioc_sync(struct file *file, void *fh, int *i) 
		/* fall through */

	case MEYE_BUF_DONE:

		meye.grab_buffer[*i].state = MEYE_BUF_UNUSED;

		kfifo_out_locked(&meye.doneq, (unsigned char *)&unused,

				sizeof(int), &meye.doneq_lock);

		if (kfifo_out_locked(&meye.doneq, (unsigned char *)&unused,

				sizeof(int), &meye.doneq_lock) != sizeof(int))

					break;

	}

	*i = meye.grab_buffer[*i].size;

	mutex_unlock(&meye.lock);

drivers/net/wireless/libertas/main.c

+4 −2
Original line number Diff line number Diff line
@@ -514,8 +514,10 @@ static int lbs_thread(void *data) 
		while (kfifo_len(&priv->event_fifo)) {

			u32 event;



			kfifo_out(&priv->event_fifo, (unsigned char *) &event,

				sizeof(event));

			if (kfifo_out(&priv->event_fifo,

				(unsigned char *) &event, sizeof(event)) !=

				sizeof(event))

					break;

			spin_unlock_irq(&priv->driver_lock);

			lbs_process_event(priv, event);

			spin_lock_irq(&priv->driver_lock);

drivers/scsi/libiscsi_tcp.c

+7 −2
Original line number Diff line number Diff line
@@ -990,8 +990,13 @@ static struct iscsi_r2t_info *iscsi_tcp_get_curr_r2t(struct iscsi_task *task) 
		}



		if (r2t == NULL) {

			kfifo_out(&tcp_task->r2tqueue,

				    (void *)&tcp_task->r2t, sizeof(void *));

			if (kfifo_out(&tcp_task->r2tqueue,

			    (void *)&tcp_task->r2t, sizeof(void *)) !=

			    sizeof(void *)) {

				WARN_ONCE(1, "unexpected fifo state");

				r2t = NULL;

			}



			r2t = tcp_task->r2t;

		}

		spin_unlock_bh(&session->lock);