From patchwork Tue Feb 8 09:46:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 540071 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p189kfki031337 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 8 Feb 2011 09:47:01 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.74) (envelope-from ) id 1Pmk9g-00045z-KU; Tue, 08 Feb 2011 09:46:40 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.74) (envelope-from ) id 1Pmk9f-00045u-JM for spi-devel-general@lists.sourceforge.net; Tue, 08 Feb 2011 09:46:39 +0000 X-ACL-Warn: Received: from metis.ext.pengutronix.de ([92.198.50.35]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.74) id 1Pmk9d-0004fz-P1 for spi-devel-general@lists.sourceforge.net; Tue, 08 Feb 2011 09:46:39 +0000 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Pmk9M-0006pA-Vt; Tue, 08 Feb 2011 10:46:20 +0100 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1Pmk9M-0006m5-Ue; Tue, 08 Feb 2011 10:46:20 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: spi-devel-general@lists.sourceforge.net Subject: [PATCH 2/2] [RFC] spi/bitbang: Use a kthread worker instead of workqueue Date: Tue, 8 Feb 2011 10:46:15 +0100 Message-Id: <1297158375-25528-2-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297158375-25528-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1297158375-25528-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: spi-devel-general@lists.sourceforge.net X-Spam-Score: -0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1Pmk9d-0004fz-P1 Cc: Sascha Hauer , kernel@pengutronix.de X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 08 Feb 2011 09:47:02 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id p189kfki031337 diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index 14a63f6..e2a874a 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c @@ -254,7 +254,7 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t) * Drivers can provide word-at-a-time i/o primitives, or provide * transfer-at-a-time ones to leverage dma or fifo hardware. */ -static void bitbang_work(struct work_struct *work) +static void bitbang_work(struct kthread_work *work) { struct spi_bitbang *bitbang = container_of(work, struct spi_bitbang, work); @@ -396,7 +396,7 @@ int spi_bitbang_transfer(struct spi_device *spi, struct spi_message *m) status = -ENETDOWN; else { list_add_tail(&m->queue, &bitbang->queue); - queue_work(bitbang->workqueue, &bitbang->work); + queue_kthread_work(&bitbang->worker, &bitbang->work); } spin_unlock_irqrestore(&bitbang->lock, flags); @@ -432,11 +432,12 @@ EXPORT_SYMBOL_GPL(spi_bitbang_transfer); int spi_bitbang_start(struct spi_bitbang *bitbang) { int status; + struct sched_param param = { .sched_priority = 49 }; if (!bitbang->master || !bitbang->chipselect) return -EINVAL; - INIT_WORK(&bitbang->work, bitbang_work); + init_kthread_work(&bitbang->work, bitbang_work); spin_lock_init(&bitbang->lock); INIT_LIST_HEAD(&bitbang->queue); @@ -463,12 +464,14 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) /* this task is the only thing to touch the SPI bits */ bitbang->busy = 0; - bitbang->workqueue = create_singlethread_workqueue( + init_kthread_worker(&bitbang->worker); + bitbang->worker_task = kthread_run(kthread_worker_fn, &bitbang->worker, dev_name(bitbang->master->dev.parent)); - if (bitbang->workqueue == NULL) { + if (bitbang->worker_task == NULL) { status = -EBUSY; goto err1; } + sched_setscheduler(bitbang->worker_task, SCHED_FIFO, ¶m); /* driver may get busy before register() returns, especially * if someone registered boardinfo for devices @@ -480,7 +483,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) return status; err2: - destroy_workqueue(bitbang->workqueue); + kthread_stop(bitbang->worker_task); err1: return status; } @@ -495,7 +498,7 @@ int spi_bitbang_stop(struct spi_bitbang *bitbang) WARN_ON(!list_empty(&bitbang->queue)); - destroy_workqueue(bitbang->workqueue); + kthread_stop(bitbang->worker_task); return 0; } diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h index f987a2b..36bb3be 100644 --- a/include/linux/spi/spi_bitbang.h +++ b/include/linux/spi/spi_bitbang.h @@ -1,11 +1,12 @@ #ifndef __SPI_BITBANG_H #define __SPI_BITBANG_H -#include +#include struct spi_bitbang { - struct workqueue_struct *workqueue; - struct work_struct work; + struct kthread_worker worker; + struct task_struct *worker_task; + struct kthread_work work; spinlock_t lock; struct list_head queue;