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

Commit b43afff7 authored by Bhaktipriya Shridhar's avatar Bhaktipriya Shridhar Committed by Mark Brown
Browse files

spi: spi-txx9: Remove deprecated create_singlethread_workqueue 



The workqueue "workqueue" has a single work item(&c->work) and hence
doesn't require ordering. Also, it is not being used on a memory reclaim
path. Hence, the singlethreaded workqueue has been replaced with the use of
system_wq.

System workqueues have been able to handle high level of concurrency
for a long time now and hence it's not required to have a singlethreaded
workqueue just to gain concurrency. Unlike a dedicated per-cpu workqueue
created with create_singlethread_workqueue(), system_wq allows multiple
work items to overlap executions even on the same CPU; however, a
per-cpu workqueue doesn't have any CPU locality or global ordering
guarantee unless the target CPU is explicitly specified and thus the
increase of local concurrency shouldn't make any difference.

Work item has been flushed in txx9spi_remove() to ensure that
nothing is pending while disconnecting the driver.

Signed-off-by: default avatarBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1a695a90

drivers/spi/spi-txx9.c

+2 −9
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 




struct txx9spi {

	struct workqueue_struct	*workqueue;

	struct work_struct work;

	spinlock_t lock;	/* protect 'queue' */

	struct list_head queue;
@@ -315,7 +314,7 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m) 


	spin_lock_irqsave(&c->lock, flags);

	list_add_tail(&m->queue, &c->queue);

	queue_work(c->workqueue, &c->work);

	schedule_work(&c->work);

	spin_unlock_irqrestore(&c->lock, flags);



	return 0;
@@ -374,10 +373,6 @@ static int txx9spi_probe(struct platform_device *dev) 
	if (ret)

		goto exit;



	c->workqueue = create_singlethread_workqueue(

				dev_name(master->dev.parent));

	if (!c->workqueue)

		goto exit_busy;

	c->last_chipselect = -1;



	dev_info(&dev->dev, "at %#llx, irq %d, %dMHz\n",
@@ -400,8 +395,6 @@ static int txx9spi_probe(struct platform_device *dev) 
exit_busy:

	ret = -EBUSY;

exit:

	if (c->workqueue)

		destroy_workqueue(c->workqueue);

	clk_disable(c->clk);

	spi_master_put(master);

	return ret;
@@ -412,7 +405,7 @@ static int txx9spi_remove(struct platform_device *dev) 
	struct spi_master *master = platform_get_drvdata(dev);

	struct txx9spi *c = spi_master_get_devdata(master);



	destroy_workqueue(c->workqueue);

	flush_work(&c->work);

	clk_disable(c->clk);

	return 0;

}