From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932925AbdABLge (ORCPT ); Mon, 2 Jan 2017 06:36:34 -0500 Received: from mga05.intel.com ([192.55.52.43]:10866 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755577AbdABLfj (ORCPT ); Mon, 2 Jan 2017 06:35:39 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,432,1477983600"; d="scan'208";a="1088947194" From: Andy Shevchenko To: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Greg Kroah-Hartman , devel@driverdev.osuosl.org, Thomas Petazzoni , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v2 1/6] staging: fbtft: convert fbtft_reset() to be non-atomic Date: Mon, 2 Jan 2017 13:35:29 +0200 Message-Id: <20170102113534.127692-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170102113534.127692-1-andriy.shevchenko@linux.intel.com> References: <20170102113534.127692-1-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org First of all, fbtft in current state doesn't allow to override GPIOs to be optional, like "reset" one. It might be a bug somewhere, but rather out of scope of this fix. Second, not all GPIOs available on the board would be SoC based, some of them might sit on I2C GPIO expanders, for example, on Intel Edison/Arduino, and thus any communication with them might sleep. Besides that using udelay() and mdelay() is kinda resource wasteful. Summarize all of the above, convert fbtft_reset() function to non-atomic variant by using gpio_set_value_cansleep(), usleep_range(), and msleep(). To avoid potential use in atomic context annotate it via might_sleep() macro. Signed-off-by: Andy Shevchenko --- drivers/staging/fbtft/fbtft-core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index bbe89c9c4fb9..e8bf0d1ec11f 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -336,11 +336,14 @@ static void fbtft_reset(struct fbtft_par *par) { if (par->gpio.reset == -1) return; + + might_sleep(); + fbtft_par_dbg(DEBUG_RESET, par, "%s()\n", __func__); - gpio_set_value(par->gpio.reset, 0); - udelay(20); - gpio_set_value(par->gpio.reset, 1); - mdelay(120); + gpio_set_value_cansleep(par->gpio.reset, 0); + usleep_range(20, 40); + gpio_set_value_cansleep(par->gpio.reset, 1); + msleep(120); } static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line, -- 2.11.0