From patchwork Tue Apr 19 09:22:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 717631 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3J9NAfq020295 for ; Tue, 19 Apr 2011 09:23:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754512Ab1DSJXL (ORCPT ); Tue, 19 Apr 2011 05:23:11 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:58818 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753237Ab1DSJXJ (ORCPT ); Tue, 19 Apr 2011 05:23:09 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTa1Ue8P7mB1cziiWoecoReMD8dpI9bI2@postini.com; Tue, 19 Apr 2011 02:23:08 PDT Received: by mail-ew0-f45.google.com with SMTP id 24so2414214ewy.18 for ; Tue, 19 Apr 2011 02:23:07 -0700 (PDT) Received: by 10.213.109.74 with SMTP id i10mr354738ebp.5.1303204987510; Tue, 19 Apr 2011 02:23:07 -0700 (PDT) Received: from deskari (a62-248-131-233.elisa-laajakaista.fi [62.248.131.233]) by mx.google.com with ESMTPS id m55sm4672311eei.8.2011.04.19.02.23.05 (version=SSLv3 cipher=OTHER); Tue, 19 Apr 2011 02:23:06 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 18/19] OMAP: DSS2: Taal: Rename esd_wq to workqueue Date: Tue, 19 Apr 2011 12:22:21 +0300 Message-Id: <1303204942-25450-19-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1303204942-25450-1-git-send-email-tomi.valkeinen@ti.com> References: <1303204942-25450-1-git-send-email-tomi.valkeinen@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 09:23:14 +0000 (UTC) ESD workqueue will be shared with other functionality also. Rename "esd_wq" to "workqueue" to better reflect its usage. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/displays/panel-taal.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 2f7a223..9626e49 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -227,7 +227,8 @@ struct taal_data { bool intro_printed; - struct workqueue_struct *esd_wq; + struct workqueue_struct *workqueue; + struct delayed_work esd_work; unsigned esd_interval; @@ -425,7 +426,7 @@ static void taal_queue_esd_work(struct omap_dss_device *dssdev) struct taal_data *td = dev_get_drvdata(&dssdev->dev); if (td->esd_interval > 0) - queue_delayed_work(td->esd_wq, &td->esd_work, + queue_delayed_work(td->workqueue, &td->esd_work, msecs_to_jiffies(td->esd_interval)); } @@ -768,8 +769,8 @@ static int taal_probe(struct omap_dss_device *dssdev) if (r) goto err_reg; - td->esd_wq = create_singlethread_workqueue("taal_esd"); - if (td->esd_wq == NULL) { + td->workqueue = create_singlethread_workqueue("taal_esd"); + if (td->workqueue == NULL) { dev_err(&dssdev->dev, "can't create ESD workqueue\n"); r = -ENOMEM; goto err_wq; @@ -868,7 +869,7 @@ err_irq: err_gpio: backlight_device_unregister(bldev); err_bl: - destroy_workqueue(td->esd_wq); + destroy_workqueue(td->workqueue); err_wq: free_regulators(panel_config->regulators, panel_config->num_regulators); err_reg: @@ -900,7 +901,7 @@ static void __exit taal_remove(struct omap_dss_device *dssdev) backlight_device_unregister(bldev); taal_cancel_esd_work(dssdev); - destroy_workqueue(td->esd_wq); + destroy_workqueue(td->workqueue); /* reset, to be sure that the panel is in a valid state */ taal_hw_reset(dssdev);