OMAP: DSS2: RFBI: convert to new kfifo API (fc248a49) · Commits · jan.koester / Linux

drivers/video/omap2/dss/rfbi.c

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,7 @@ static struct {

	struct omap_dss_device *dssdev[2];		struct omap_dss_device *dssdev[2];

	struct kfifo *cmd_fifo;		struct kfifo cmd_fifo;
	spinlock_t cmd_lock;		spinlock_t cmd_lock;
	struct completion cmd_done;		struct completion cmd_done;
	atomic_t cmd_fifo_full;		atomic_t cmd_fifo_full;
	@@ -1011,20 +1011,20 @@ static void process_cmd_fifo(void)
	return;		return;

	while (true) {		while (true) {
	spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);		spin_lock_irqsave(&rfbi.cmd_lock, flags);

	len = __kfifo_get(rfbi.cmd_fifo, (unsigned char *)&p,		len = kfifo_out(&rfbi.cmd_fifo, (unsigned char *)&p,
	sizeof(struct update_param));		sizeof(struct update_param));
	if (len == 0) {		if (len == 0) {
	DSSDBG("nothing more in fifo\n");		DSSDBG("nothing more in fifo\n");
	atomic_set(&rfbi.cmd_pending, 0);		atomic_set(&rfbi.cmd_pending, 0);
	spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);		spin_unlock_irqrestore(&rfbi.cmd_lock, flags);
	break;		break;
	}		}

	/* DSSDBG("fifo full %d\n", rfbi.cmd_fifo_full.counter);*/		/* DSSDBG("fifo full %d\n", rfbi.cmd_fifo_full.counter);*/

	spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);		spin_unlock_irqrestore(&rfbi.cmd_lock, flags);

	BUG_ON(len != sizeof(struct update_param));		BUG_ON(len != sizeof(struct update_param));
	BUG_ON(p.rfbi_module > 1);		BUG_ON(p.rfbi_module > 1);
	@@ -1052,25 +1052,25 @@ static void rfbi_push_cmd(struct update_param *p)
	unsigned long flags;		unsigned long flags;
	int available;		int available;

	spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);		spin_lock_irqsave(&rfbi.cmd_lock, flags);
	available = RFBI_CMD_FIFO_LEN_BYTES -		available = RFBI_CMD_FIFO_LEN_BYTES -
	__kfifo_len(rfbi.cmd_fifo);		kfifo_len(&rfbi.cmd_fifo);

	/* DSSDBG("%d bytes left in fifo\n", available); */		/* DSSDBG("%d bytes left in fifo\n", available); */
	if (available < sizeof(struct update_param)) {		if (available < sizeof(struct update_param)) {
	DSSDBG("Going to wait because FIFO FULL..\n");		DSSDBG("Going to wait because FIFO FULL..\n");
	spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);		spin_unlock_irqrestore(&rfbi.cmd_lock, flags);
	atomic_inc(&rfbi.cmd_fifo_full);		atomic_inc(&rfbi.cmd_fifo_full);
	wait_for_completion(&rfbi.cmd_done);		wait_for_completion(&rfbi.cmd_done);
	/DSSDBG("Woke up because fifo not full anymore\n");/		/DSSDBG("Woke up because fifo not full anymore\n");/
	continue;		continue;
	}		}

	ret = __kfifo_put(rfbi.cmd_fifo, (unsigned char *)p,		ret = kfifo_in(&rfbi.cmd_fifo, (unsigned char *)p,
	sizeof(struct update_param));		sizeof(struct update_param));
	/* DSSDBG("pushed %d bytes\n", ret);*/		/* DSSDBG("pushed %d bytes\n", ret);*/

	spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);		spin_unlock_irqrestore(&rfbi.cmd_lock, flags);

	BUG_ON(ret != sizeof(struct update_param));		BUG_ON(ret != sizeof(struct update_param));

	@@ -1155,12 +1155,12 @@ int rfbi_init(void)
	{		{
	u32 rev;		u32 rev;
	u32 l;		u32 l;
			int r;

	spin_lock_init(&rfbi.cmd_lock);		spin_lock_init(&rfbi.cmd_lock);
	rfbi.cmd_fifo = kfifo_alloc(RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL,		r = kfifo_alloc(&rfbi.cmd_fifo, RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL);
	&rfbi.cmd_lock);		if (r)
	if (IS_ERR(rfbi.cmd_fifo))		return r;
	return -ENOMEM;

	init_completion(&rfbi.cmd_done);		init_completion(&rfbi.cmd_done);
	atomic_set(&rfbi.cmd_fifo_full, 0);		atomic_set(&rfbi.cmd_fifo_full, 0);
	@@ -1196,7 +1196,7 @@ void rfbi_exit(void)
	{		{
	DSSDBG("rfbi_exit\n");		DSSDBG("rfbi_exit\n");

	kfifo_free(rfbi.cmd_fifo);		kfifo_free(&rfbi.cmd_fifo);

	iounmap(rfbi.base);		iounmap(rfbi.base);
	}		}