Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1051571ybp; Thu, 17 Oct 2019 07:22:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzg9XzCL5/dUq5aX2/6hXFKs6L3+VSM8P4eHWHCyJOAq3b3loP941TONuR3jWYBu0p+vO01 X-Received: by 2002:a17:906:a2d1:: with SMTP id by17mr3785289ejb.206.1571322156864; Thu, 17 Oct 2019 07:22:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571322156; cv=none; d=google.com; s=arc-20160816; b=PIx5nD2xEXKnNEO7ABVwdePrNAhd+/l4a8owEFKmfkej5bqmxDYpBYIrbYZ+c9+Cjs rbs1lTpiVgP1hPs03xwtXRWuuCE71y0+TCix+zsXyX6a6q+sU11rFWAVwovOPIgP6uFT yu1/UNvpKDhh1cbL7IfTMDDojDBVzDhSXS5GqseRn1eOJSFwZYCQlkmnbK9MqKS7FxdY Vuwt26KfuXdLRP2IfxEs1YTz05iVpP//y49X5moRePreU2JsI1cc5NZ/HYRxuDTIkg5B 4dZ8YYsYQ89tB4e875neysdtRR88rgixJtaqIy1zpruLA9o4qdXB/+SG92s40d5j8cnC sKGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FB9rDdnkSo2h84joH3eoNCJmrigN1enBJbP+zSSSyio=; b=AJONQya0Z5ulrpSW5pt++EhnF72yUxXi5/Wtb6hZpp2T/iJgUnONCDan7JM3Ihfe9u uwsB/mAg6oUaLThT9+AD95WUKs/MxP87uQgWfY5lujo/VnOYvY4tFYumOsp2UU9PFIQT ydV1pIvSVpmsVaWYICUceUwGGFvlBgYvY/IH7V9dESz25wgBTjsd19IYcfLtFCsaH6D4 Ss6yRmynE2d9txmIOzlUqHx99Ix67B0sYs4TmVudcXfKgfFO3pRtbYTbalcuu45RNhf3 fqjwZtlba6dEFDVAoDLMdXDsAefX51btGQw3DRAPznhCXg//1tO+sFckj235/+Y+yL3A QobA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="en/BkUV/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 96si1703537edq.24.2019.10.17.07.22.14; Thu, 17 Oct 2019 07:22:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="en/BkUV/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395195AbfJPVz0 (ORCPT + 99 others); Wed, 16 Oct 2019 17:55:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:46012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437801AbfJPVzY (ORCPT ); Wed, 16 Oct 2019 17:55:24 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87DAC21A49; Wed, 16 Oct 2019 21:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262923; bh=EE8r8kOpU5cZ96Shez9OnNPtZeQUgC5DTwgzYVqlx8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=en/BkUV/yw1ox3wElZSZb0x7Fj+P7GfxdnoLdw0x1C0S5KCtI2+6kZv/vP4gGR15E Ddlyc5DFbX013WOY3YuqrE0CkiYVAS7CMjZDr3GbyDUpL2Zt9MlrutTULEBaQWg5QX ur5BU61dr2hR3VaymUZw55phTvc+j8zGVQdUlIos= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Vetter , Daniel Thompson , Jani Nikula , Lee Jones , Sasha Levin Subject: [PATCH 4.9 83/92] staging: fbtft: Stop using BL_CORE_DRIVER1 Date: Wed, 16 Oct 2019 14:50:56 -0700 Message-Id: <20191016214847.581586403@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Vetter [ Upstream commit 9adfe5c89be497bb8761a9f788297c258d535334 ] Leaking driver internal tracking into the already massively confusing backlight power tracking is really confusing. Luckily we have already a drvdata structure, so fixing this is really easy. Signed-off-by: Daniel Vetter Acked-by: Daniel Thompson Reviewed-by: Jani Nikula Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/staging/fbtft/fbtft-core.c | 4 ++-- drivers/staging/fbtft/fbtft.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 587f68aa466c2..f4682ba44cd74 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -247,7 +247,7 @@ static int fbtft_request_gpios_dt(struct fbtft_par *par) static int fbtft_backlight_update_status(struct backlight_device *bd) { struct fbtft_par *par = bl_get_data(bd); - bool polarity = !!(bd->props.state & BL_CORE_DRIVER1); + bool polarity = par->polarity; fbtft_par_dbg(DEBUG_BACKLIGHT, par, "%s: polarity=%d, power=%d, fb_blank=%d\n", @@ -296,7 +296,7 @@ void fbtft_register_backlight(struct fbtft_par *par) /* Assume backlight is off, get polarity from current state of pin */ bl_props.power = FB_BLANK_POWERDOWN; if (!gpio_get_value(par->gpio.led[0])) - bl_props.state |= BL_CORE_DRIVER1; + par->polarity = true; bd = backlight_device_register(dev_driver_string(par->info->device), par->info->device, par, &fbtft_bl_ops, &bl_props); diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 89c4b5b76ce69..0275319906748 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -241,6 +241,7 @@ struct fbtft_par { ktime_t update_time; bool bgr; void *extra; + bool polarity; }; #define NUMARGS(...) (sizeof((int[]){__VA_ARGS__})/sizeof(int)) -- 2.20.1