From patchwork Mon Dec 8 22:21:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 5459291 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 46CF0BEEA8 for ; Mon, 8 Dec 2014 22:21:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 721FD20155 for ; Mon, 8 Dec 2014 22:21:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 443032011D for ; Mon, 8 Dec 2014 22:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752039AbaLHWVi (ORCPT ); Mon, 8 Dec 2014 17:21:38 -0500 Received: from mail-qg0-f47.google.com ([209.85.192.47]:48945 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331AbaLHWVi (ORCPT ); Mon, 8 Dec 2014 17:21:38 -0500 Received: by mail-qg0-f47.google.com with SMTP id z60so4190933qgd.6 for ; Mon, 08 Dec 2014 14:21:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HCmwU0BSS0QLsHsO5djsgwcP4DXajknKBpm3NtfpaDA=; b=cpSnFmqYG+r9/Hcn66YkVtCNTecp5GhubyaRsmKduK7bXcd9tKBWK5WsDhIqgZKM7P JjgJsU5e3HwfpStNnibfs692iKu4a5JyW/x42ECRFWMhpQNvDKpcl7LVT3UlDAxEyU8w 8iX8FdgHRwQ8xQSMGn/pu+guFNTA6HdKshc98= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HCmwU0BSS0QLsHsO5djsgwcP4DXajknKBpm3NtfpaDA=; b=DnoVANlDoi6URAja3TacPympb1gpFKtsfJhgHkQnxvcX+Moal8jmbE4sOM4nvcgzMR 5ttAxRlN0cma9skfNg8nx3irKEcObKIDen2YEl2WVx9FqT+ZNco7jFlxbFZNhAhsWqUY go//yRUd3aKVxideVmjduCR68/i673G2M6jrapLO6K15ewTzq5PVaHdw+t4E3qLajqOR iOKAvJYzRhuol3pgcfGgfIdHwi8Y30n3U/sVkUjDRUURHqDSjW0IYHxZXqmzjF5RCvbm OihnlHTrpu+C7h3ufoSxgpiAW/tYQ6PozEaKSHwDw5m3uNSqF2VIzDHW34JPhbsYrzI8 w9UQ== X-Gm-Message-State: ALoCoQmrZQJ5wGIX2d86mqcNfh9BboN7YPUbn15iVMSEZQ5EY02sHixut0CKhtN+ZUhJC4XsLkKz X-Received: by 10.224.74.132 with SMTP id u4mr57459940qaj.61.1418077297331; Mon, 08 Dec 2014 14:21:37 -0800 (PST) Received: from philcollins.nc.rr.com (cpe-173-095-180-236.nc.res.rr.com. [173.95.180.236]) by mx.google.com with ESMTPSA id 9sm22084410qah.46.2014.12.08.14.21.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Dec 2014 14:21:36 -0800 (PST) From: Sean Paul To: milo.kim@ti.com, linux-fbdev@vger.kernel.org Cc: arnd@arndb.de, lee.jones@linaro.org, cooloney@gmail.com, jg1.han@samsung.com, Sean Paul Subject: [PATCH v2 4/4] backlight/lp855x: Remove CONFIG_OF ifdef in favor of Kconfig depends Date: Mon, 8 Dec 2014 17:21:18 -0500 Message-Id: <1418077278-14144-4-git-send-email-seanpaul@chromium.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1418077278-14144-1-git-send-email-seanpaul@chromium.org> References: <1418077278-14144-1-git-send-email-seanpaul@chromium.org> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that we've removed all traces of pdata, remove the CONFIG_OF ifdef from lp855x and instead make the driver depend on OF. Signed-off-by: Sean Paul Acked-by: Jingoo Han --- Changes in v2: - Remove of_match_ptr() wrapper drivers/video/backlight/Kconfig | 2 +- drivers/video/backlight/lp855x_bl.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 8d03924..113c8b3 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -384,7 +384,7 @@ config BACKLIGHT_LM3639 config BACKLIGHT_LP855X tristate "Backlight driver for TI LP855X" - depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM + depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM && OF help This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and LP8557 backlight driver. diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c index 6530d60..f0a85f5 100644 --- a/drivers/video/backlight/lp855x_bl.c +++ b/drivers/video/backlight/lp855x_bl.c @@ -379,7 +379,6 @@ static const struct attribute_group lp855x_attr_group = { .attrs = lp855x_attributes, }; -#ifdef CONFIG_OF static int lp855x_parse_dt(struct lp855x *lp) { struct device *dev = lp->dev; @@ -426,12 +425,6 @@ static int lp855x_parse_dt(struct lp855x *lp) return 0; } -#else -static int lp855x_parse_dt(struct lp855x *lp) -{ - return -EINVAL; -} -#endif static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) { @@ -532,7 +525,7 @@ MODULE_DEVICE_TABLE(i2c, lp855x_ids); static struct i2c_driver lp855x_driver = { .driver = { .name = "lp855x", - .of_match_table = of_match_ptr(lp855x_dt_ids), + .of_match_table = lp855x_dt_ids, }, .probe = lp855x_probe, .remove = lp855x_remove,