From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v1 3/5] fbtft: Drop useless #ifdef CONFIG_OF and dead code Date: Wed, 20 Nov 2019 11:57:14 +0200 Message-ID: <20191120095716.26628-3-andriy.shevchenko@linux.intel.com> References: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , linux-fbdev@vger.kernel.org, Nishad Kamdar , devel@driverdev.osuosl.org Cc: Andy Shevchenko List-Id: dri-devel@lists.freedesktop.org First of all there is no need to guard GPIO request by CONFIG_OF. It works for everybody independently on resource provider. While here, rename the function to reflect the above. Moreover, since we have a global dependency to OF, the rest of conditional compilation is no-op, i.e. it's always be true. Due to above drop useless #ifdef CONFIG_OF and therefore dead code. Signed-off-by: Andy Shevchenko --- drivers/staging/fbtft/fbtft-core.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 2122c4407bdb..ff8cb6670ea1 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -70,7 +70,6 @@ void fbtft_dbg_hex(const struct device *dev, int groupsize, } EXPORT_SYMBOL(fbtft_dbg_hex); -#ifdef CONFIG_OF static int fbtft_request_one_gpio(struct fbtft_par *par, const char *name, int index, struct gpio_desc **gpiop) @@ -92,14 +91,11 @@ static int fbtft_request_one_gpio(struct fbtft_par *par, return ret; } -static int fbtft_request_gpios_dt(struct fbtft_par *par) +static int fbtft_request_gpios(struct fbtft_par *par) { int i; int ret; - if (!par->info->device->of_node) - return -EINVAL; - ret = fbtft_request_one_gpio(par, "reset", 0, &par->gpio.reset); if (ret) return ret; @@ -135,7 +131,6 @@ static int fbtft_request_gpios_dt(struct fbtft_par *par) return 0; } -#endif #ifdef CONFIG_FB_BACKLIGHT static int fbtft_backlight_update_status(struct backlight_device *bd) @@ -898,7 +893,6 @@ int fbtft_unregister_framebuffer(struct fb_info *fb_info) } EXPORT_SYMBOL(fbtft_unregister_framebuffer); -#ifdef CONFIG_OF /** * fbtft_init_display_dt() - Device Tree init_display() function * @par: Driver data @@ -977,7 +971,6 @@ static int fbtft_init_display_dt(struct fbtft_par *par) return 0; } -#endif /** * fbtft_init_display() - Generic init_display() function @@ -1138,7 +1131,6 @@ static int fbtft_verify_gpios(struct fbtft_par *par) return 0; } -#ifdef CONFIG_OF /* returns 0 if the property is not present */ static u32 fbtft_of_value(struct device_node *node, const char *propname) { @@ -1184,17 +1176,10 @@ static struct fbtft_platform_data *fbtft_probe_dt(struct device *dev) pdata->display.backlight = 1; if (of_find_property(node, "init", NULL)) pdata->display.fbtftops.init_display = fbtft_init_display_dt; - pdata->display.fbtftops.request_gpios = fbtft_request_gpios_dt; + pdata->display.fbtftops.request_gpios = fbtft_request_gpios; return pdata; } -#else -static struct fbtft_platform_data *fbtft_probe_dt(struct device *dev) -{ - dev_err(dev, "Missing platform data\n"); - return ERR_PTR(-EINVAL); -} -#endif /** * fbtft_probe_common() - Generic device probe() helper function -- 2.24.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D223C432C0 for ; Thu, 21 Nov 2019 07:59:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48BDC20872 for ; Thu, 21 Nov 2019 07:59:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48BDC20872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 651496EB5D; Thu, 21 Nov 2019 07:59:21 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 74B906E117 for ; Wed, 20 Nov 2019 09:57:20 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2019 01:57:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,221,1571727600"; d="scan'208";a="204685531" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 20 Nov 2019 01:57:18 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9602F250; Wed, 20 Nov 2019 11:57:17 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , linux-fbdev@vger.kernel.org, Nishad Kamdar , devel@driverdev.osuosl.org Subject: [PATCH v1 3/5] fbtft: Drop useless #ifdef CONFIG_OF and dead code Date: Wed, 20 Nov 2019 11:57:14 +0200 Message-Id: <20191120095716.26628-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com> References: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 21 Nov 2019 07:59:20 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Shevchenko Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191120095714.VsU6gb1EITijKrAKeN-_UjAnhYUDKk6YJgL1veqvky0@z> Rmlyc3Qgb2YgYWxsIHRoZXJlIGlzIG5vIG5lZWQgdG8gZ3VhcmQgR1BJTyByZXF1ZXN0IGJ5IENP TkZJR19PRi4KSXQgd29ya3MgZm9yIGV2ZXJ5Ym9keSBpbmRlcGVuZGVudGx5IG9uIHJlc291cmNl IHByb3ZpZGVyLiBXaGlsZSBoZXJlLApyZW5hbWUgdGhlIGZ1bmN0aW9uIHRvIHJlZmxlY3QgdGhl IGFib3ZlLgoKTW9yZW92ZXIsIHNpbmNlIHdlIGhhdmUgYSBnbG9iYWwgZGVwZW5kZW5jeSB0byBP RiwgdGhlIHJlc3Qgb2YKY29uZGl0aW9uYWwgY29tcGlsYXRpb24gaXMgbm8tb3AsIGkuZS4gaXQn cyBhbHdheXMgYmUgdHJ1ZS4KCkR1ZSB0byBhYm92ZSBkcm9wIHVzZWxlc3MgI2lmZGVmIENPTkZJ R19PRiBhbmQgdGhlcmVmb3JlIGRlYWQgY29kZS4KClNpZ25lZC1vZmYtYnk6IEFuZHkgU2hldmNo ZW5rbyA8YW5kcml5LnNoZXZjaGVua29AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvc3Rh Z2luZy9mYnRmdC9mYnRmdC1jb3JlLmMgfCAxOSArKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQtY29yZS5jIGIvZHJpdmVycy9zdGFnaW5nL2ZidGZ0 L2ZidGZ0LWNvcmUuYwppbmRleCAyMTIyYzQ0MDdiZGIuLmZmOGNiNjY3MGVhMSAxMDA2NDQKLS0t IGEvZHJpdmVycy9zdGFnaW5nL2ZidGZ0L2ZidGZ0LWNvcmUuYworKysgYi9kcml2ZXJzL3N0YWdp bmcvZmJ0ZnQvZmJ0ZnQtY29yZS5jCkBAIC03MCw3ICs3MCw2IEBAIHZvaWQgZmJ0ZnRfZGJnX2hl eChjb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYsIGludCBncm91cHNpemUsCiB9CiBFWFBPUlRfU1lN Qk9MKGZidGZ0X2RiZ19oZXgpOwogCi0jaWZkZWYgQ09ORklHX09GCiBzdGF0aWMgaW50IGZidGZ0 X3JlcXVlc3Rfb25lX2dwaW8oc3RydWN0IGZidGZ0X3BhciAqcGFyLAogCQkJCSAgY29uc3QgY2hh ciAqbmFtZSwgaW50IGluZGV4LAogCQkJCSAgc3RydWN0IGdwaW9fZGVzYyAqKmdwaW9wKQpAQCAt OTIsMTQgKzkxLDExIEBAIHN0YXRpYyBpbnQgZmJ0ZnRfcmVxdWVzdF9vbmVfZ3BpbyhzdHJ1Y3Qg ZmJ0ZnRfcGFyICpwYXIsCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBmYnRmdF9yZXF1 ZXN0X2dwaW9zX2R0KHN0cnVjdCBmYnRmdF9wYXIgKnBhcikKK3N0YXRpYyBpbnQgZmJ0ZnRfcmVx dWVzdF9ncGlvcyhzdHJ1Y3QgZmJ0ZnRfcGFyICpwYXIpCiB7CiAJaW50IGk7CiAJaW50IHJldDsK IAotCWlmICghcGFyLT5pbmZvLT5kZXZpY2UtPm9mX25vZGUpCi0JCXJldHVybiAtRUlOVkFMOwot CiAJcmV0ID0gZmJ0ZnRfcmVxdWVzdF9vbmVfZ3BpbyhwYXIsICJyZXNldCIsIDAsICZwYXItPmdw aW8ucmVzZXQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CkBAIC0xMzUsNyArMTMxLDYgQEAg c3RhdGljIGludCBmYnRmdF9yZXF1ZXN0X2dwaW9zX2R0KHN0cnVjdCBmYnRmdF9wYXIgKnBhcikK IAogCXJldHVybiAwOwogfQotI2VuZGlmCiAKICNpZmRlZiBDT05GSUdfRkJfQkFDS0xJR0hUCiBz dGF0aWMgaW50IGZidGZ0X2JhY2tsaWdodF91cGRhdGVfc3RhdHVzKHN0cnVjdCBiYWNrbGlnaHRf ZGV2aWNlICpiZCkKQEAgLTg5OCw3ICs4OTMsNiBAQCBpbnQgZmJ0ZnRfdW5yZWdpc3Rlcl9mcmFt ZWJ1ZmZlcihzdHJ1Y3QgZmJfaW5mbyAqZmJfaW5mbykKIH0KIEVYUE9SVF9TWU1CT0woZmJ0ZnRf dW5yZWdpc3Rlcl9mcmFtZWJ1ZmZlcik7CiAKLSNpZmRlZiBDT05GSUdfT0YKIC8qKgogICogZmJ0 ZnRfaW5pdF9kaXNwbGF5X2R0KCkgLSBEZXZpY2UgVHJlZSBpbml0X2Rpc3BsYXkoKSBmdW5jdGlv bgogICogQHBhcjogRHJpdmVyIGRhdGEKQEAgLTk3Nyw3ICs5NzEsNiBAQCBzdGF0aWMgaW50IGZi dGZ0X2luaXRfZGlzcGxheV9kdChzdHJ1Y3QgZmJ0ZnRfcGFyICpwYXIpCiAKIAlyZXR1cm4gMDsK IH0KLSNlbmRpZgogCiAvKioKICAqIGZidGZ0X2luaXRfZGlzcGxheSgpIC0gR2VuZXJpYyBpbml0 X2Rpc3BsYXkoKSBmdW5jdGlvbgpAQCAtMTEzOCw3ICsxMTMxLDYgQEAgc3RhdGljIGludCBmYnRm dF92ZXJpZnlfZ3Bpb3Moc3RydWN0IGZidGZ0X3BhciAqcGFyKQogCXJldHVybiAwOwogfQogCi0j aWZkZWYgQ09ORklHX09GCiAvKiByZXR1cm5zIDAgaWYgdGhlIHByb3BlcnR5IGlzIG5vdCBwcmVz ZW50ICovCiBzdGF0aWMgdTMyIGZidGZ0X29mX3ZhbHVlKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9k ZSwgY29uc3QgY2hhciAqcHJvcG5hbWUpCiB7CkBAIC0xMTg0LDE3ICsxMTc2LDEwIEBAIHN0YXRp YyBzdHJ1Y3QgZmJ0ZnRfcGxhdGZvcm1fZGF0YSAqZmJ0ZnRfcHJvYmVfZHQoc3RydWN0IGRldmlj ZSAqZGV2KQogCQlwZGF0YS0+ZGlzcGxheS5iYWNrbGlnaHQgPSAxOwogCWlmIChvZl9maW5kX3By b3BlcnR5KG5vZGUsICJpbml0IiwgTlVMTCkpCiAJCXBkYXRhLT5kaXNwbGF5LmZidGZ0b3BzLmlu aXRfZGlzcGxheSA9IGZidGZ0X2luaXRfZGlzcGxheV9kdDsKLQlwZGF0YS0+ZGlzcGxheS5mYnRm dG9wcy5yZXF1ZXN0X2dwaW9zID0gZmJ0ZnRfcmVxdWVzdF9ncGlvc19kdDsKKwlwZGF0YS0+ZGlz cGxheS5mYnRmdG9wcy5yZXF1ZXN0X2dwaW9zID0gZmJ0ZnRfcmVxdWVzdF9ncGlvczsKIAogCXJl dHVybiBwZGF0YTsKIH0KLSNlbHNlCi1zdGF0aWMgc3RydWN0IGZidGZ0X3BsYXRmb3JtX2RhdGEg KmZidGZ0X3Byb2JlX2R0KHN0cnVjdCBkZXZpY2UgKmRldikKLXsKLQlkZXZfZXJyKGRldiwgIk1p c3NpbmcgcGxhdGZvcm0gZGF0YVxuIik7Ci0JcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7Ci19Ci0j ZW5kaWYKIAogLyoqCiAgKiBmYnRmdF9wcm9iZV9jb21tb24oKSAtIEdlbmVyaWMgZGV2aWNlIHBy b2JlKCkgaGVscGVyIGZ1bmN0aW9uCi0tIAoyLjI0LjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==