Received: by 10.223.176.46 with SMTP id f43csp832382wra; Fri, 19 Jan 2018 02:41:37 -0800 (PST) X-Google-Smtp-Source: ACJfBosS+YScV2P6Asb443OSCOW+PIqe2dh5btH4GbkASTmkGuwlMl2W1Y4zFJ25UHuwPQc1E2PQ X-Received: by 10.99.96.203 with SMTP id u194mr38372484pgb.167.1516358497597; Fri, 19 Jan 2018 02:41:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516358497; cv=none; d=google.com; s=arc-20160816; b=dXj2D8L11OEhQqjcJcLFlApzAAVjrqKDZw6upuJWxHUE7iA71s3F15XIwWalMAksJH jih4+ibs5d0R9EZsNl7fZONESf6b8tau1Cgfwy8c+iorxTtnFMVwN0uI0akrK4CIBtVZ 7QQrPRL0InqSQZ8k/xF/Nu+lpEoiLMP644T2y7vF7XuypUYOQ1kL1vNqvSj2mJ8eP+f5 cYLSNlLnkNSbhlnuQIG/7ps9EMZSz85KcLxTO6+tRSsGiEUJcz9RyPBgv5B3vav8jQ+8 6yOQAcUnQFqqgfPVc1jVyVqpZbnMXRzOAo1TTzJHKj5QKsxtJgvDnt37hjyGssBQk22O xQIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:to :from:date:dkim-signature:arc-authentication-results; bh=yp9UlWf6M4Vc15o9E5SZ65pLEiv2eSu48nMSkIvwHA4=; b=u86f0kX2irbfqtcMRqvdjaotWiCtuW3d1o+ChgRpw5umrGnYVLFmdmnfrh7XzLJvo5 MTYw2kIH7NTGIKWcBOExIbBljkKmgJ0zMfyypjhltBlXMJ/2ExXfx4XzcpQCfydHwLpr ijUS9NNDfgmCtVKXVBrBIJstCUv+8pMydZiR4TJsdG486lxThQ6i5RPUnQDPM6cRv6Lb WJgBadD56J5PY0Yq9cgJh05fWd6DRvmZbh2k5hkvXrZbmgZs8mowGAr+CvTJ/Sa8Opet 8SMITF8NWs9vLM4zBlKeCCkLgU8L9UhjJootUM71v182dZyJ1epWe+3dcfvWtfwGgrjS pYBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nlTxY6yB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si7809069pgv.317.2018.01.19.02.41.23; Fri, 19 Jan 2018 02:41:37 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=nlTxY6yB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754910AbeASKkr (ORCPT + 99 others); Fri, 19 Jan 2018 05:40:47 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:37708 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754771AbeASKkm (ORCPT ); Fri, 19 Jan 2018 05:40:42 -0500 Received: by mail-pf0-f195.google.com with SMTP id p1so1066007pfh.4 for ; Fri, 19 Jan 2018 02:40:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=yp9UlWf6M4Vc15o9E5SZ65pLEiv2eSu48nMSkIvwHA4=; b=nlTxY6yBS83VQ7qZH5V+LyuzsXfcQs/0xF9UvGBZaZWp3u8bYF2faFUcgPWSBP9H9n SQuo5ZuSG/5k17atPIpuNfSiUgBIAoIXn29u+zgbwZxc41TSLq+L7bV/6HWnS25RDvqb UWhLUZIZQycAchY5B4urX/iaNdhXWrpTA0G086Dl+pGF+F1blfjaT3RZAUmNTjLvPxWD +/JlWFrgidhYxQkU4FYsreVda1M4VlVFj871FWfNmHkvMw8Wsceh+5lkoBol7/Zir5zv kOWeA9frBpd/7MMVoM+lnIYAEmcWliCQ2R+soGXqa042v27q5IdQJ4JnmsKUT/i2r12z XqfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=yp9UlWf6M4Vc15o9E5SZ65pLEiv2eSu48nMSkIvwHA4=; b=Qxa0MKdeFtzKfh+j0g7NxNyzwW3/zjTa0+QeZPAIyDokSb2bT1x2JXYLhC4PR2B3D6 woHU4PrKCsgex1DmxJKXKSc8g9pRRiTSmjF5CbD0pNh2nXPM/qsD6/nkE2frEd521nRo 0LxQkn+fiaamgjuNDdr1tpAfPFp4gG5Vs1SQgv9bzvOcQLlp0tCXem+68QIBW0DdONza 5K0h+v1HYbW5f1ggbQvWuJIrciJbc1ynX+qjWieNGZUbxsmfxq+UTB3QC33Wmcf8+zyL 3OBrEodLbrJShQbCoJ3L2GfnvYnFGwy59OAlzO812YRzKxsyWobR7ZqQ2AZzjIBWW+ui x6wg== X-Gm-Message-State: AKwxytf57Ob762AJgKfs/qorKVO3qPD12jI3x3i2KmAUUQTfVLVcQwV3 QD9nk5DErwjOpqot9rTzkUM= X-Received: by 10.98.159.25 with SMTP id g25mr18886733pfe.224.1516358441533; Fri, 19 Jan 2018 02:40:41 -0800 (PST) Received: from raspberrypi ([122.171.87.79]) by smtp.gmail.com with ESMTPSA id s186sm15809717pgb.67.2018.01.19.02.40.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2018 02:40:40 -0800 (PST) Date: Fri, 19 Jan 2018 10:40:35 +0000 From: Meghana Madhyastha To: Lee Jones , Daniel Thompson , Jingoo Han , Thierry Reding , Noralf =?iso-8859-1?Q?Tr=F8nnes?= , Tomi Valkeinen , Daniel Vetter , Sean Paul , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v17 02/10] drm/tinydrm: Convert tinydrm_enable/disable_backlight to backlight_enable/disable Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove tinydrm_enable/disable_backlight and let the callers call the more generic backlight_enable/disable helpers Signed-off-by: Meghana Madhyastha --- changes in v17: -rebase with drm-misc-next drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 55 -------------------------- drivers/gpu/drm/tinydrm/mipi-dbi.c | 4 +- include/drm/tinydrm/tinydrm-helpers.h | 2 - 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c index bf96072d1..7326e1758 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c @@ -276,61 +276,6 @@ struct backlight_device *tinydrm_of_find_backlight(struct device *dev) } EXPORT_SYMBOL(tinydrm_of_find_backlight); -/** - * tinydrm_enable_backlight - Enable backlight helper - * @backlight: Backlight device - * - * Returns: - * Zero on success, negative error code on failure. - */ -int tinydrm_enable_backlight(struct backlight_device *backlight) -{ - unsigned int old_state; - int ret; - - if (!backlight) - return 0; - - old_state = backlight->props.state; - backlight->props.state &= ~BL_CORE_FBBLANK; - DRM_DEBUG_KMS("Backlight state: 0x%x -> 0x%x\n", old_state, - backlight->props.state); - - ret = backlight_update_status(backlight); - if (ret) - DRM_ERROR("Failed to enable backlight %d\n", ret); - - return ret; -} -EXPORT_SYMBOL(tinydrm_enable_backlight); - -/** - * tinydrm_disable_backlight - Disable backlight helper - * @backlight: Backlight device - * - * Returns: - * Zero on success, negative error code on failure. - */ -int tinydrm_disable_backlight(struct backlight_device *backlight) -{ - unsigned int old_state; - int ret; - - if (!backlight) - return 0; - - old_state = backlight->props.state; - backlight->props.state |= BL_CORE_FBBLANK; - DRM_DEBUG_KMS("Backlight state: 0x%x -> 0x%x\n", old_state, - backlight->props.state); - ret = backlight_update_status(backlight); - if (ret) - DRM_ERROR("Failed to disable backlight %d\n", ret); - - return ret; -} -EXPORT_SYMBOL(tinydrm_disable_backlight); - #if IS_ENABLED(CONFIG_SPI) /** diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c index 75dd65c57..9e903812b 100644 --- a/drivers/gpu/drm/tinydrm/mipi-dbi.c +++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c @@ -286,7 +286,7 @@ void mipi_dbi_enable_flush(struct mipi_dbi *mipi) if (fb) fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0); - tinydrm_enable_backlight(mipi->backlight); + backlight_enable(mipi->backlight); } EXPORT_SYMBOL(mipi_dbi_enable_flush); @@ -325,7 +325,7 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe) mipi->enabled = false; if (mipi->backlight) - tinydrm_disable_backlight(mipi->backlight); + backlight_disable(mipi->backlight); else mipi_dbi_blank(mipi); diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h index d554ded60..f54fae03e 100644 --- a/include/drm/tinydrm/tinydrm-helpers.h +++ b/include/drm/tinydrm/tinydrm-helpers.h @@ -47,8 +47,6 @@ void tinydrm_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_clip_rect *clip); struct backlight_device *tinydrm_of_find_backlight(struct device *dev); -int tinydrm_enable_backlight(struct backlight_device *backlight); -int tinydrm_disable_backlight(struct backlight_device *backlight); size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len); bool tinydrm_spi_bpw_supported(struct spi_device *spi, u8 bpw); -- 2.11.0