From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Andrew F. Davis" Subject: [PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled Date: Mon, 20 Jun 2016 17:13:40 -0500 Message-ID: <57686A94.2010704@ti.com> References: <20160613200211.14790-1-afd@ti.com> <20160613200211.14790-13-afd@ti.com> <5760FA52.7010806@samsung.com> <57647DBD.2010406@ti.com> <57679E38.3080901@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <57679E38.3080901@samsung.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" To: Jacek Anaszewski Cc: Ulf Hansson , Wolfram Sang , Linus Walleij , Sebastian Reichel , linux-i2c@vger.kernel.org, Ingo Molnar , Aloisio Almeida Jr , lguest@lists.ozlabs.org, Samuel Ortiz , Russell King , linux-leds@vger.kernel.org, linux-mmc@vger.kernel.org, linux-media@vger.kernel.org, linux-pwm@vger.kernel.org, Mauro Carvalho Chehab , Rusty Russell , linux-gpio@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Lauro Ramos Venancio , Miguel Ojeda Sandonis , Richard Purdie , linuxppc-dev@lists.ozlabs.org List-Id: linux-gpio@vger.kernel.org U29tZSBzeXN0ZW1zIHVzZSAnZ3Bpb19sZWRfcmVnaXN0ZXJfZGV2aWNlJyB0byBtYWtlIGFuIGlu LW1lbW9yeSBjb3B5IG9mCnRoZWlyIExFRCBkZXZpY2UgdGFibGUgc28gdGhlIG9yaWdpbmFsIGNh biBiZSByZW1vdmVkIGFzIC5pbml0LnJvZGF0YS4KV2hlbiB0aGUgTEVEIHN1YnN5c3RlbSBpcyBu b3QgZW5hYmxlZCBzb3VyY2UgaW4gdGhlIGxlZCBkaXJlY3RvcnkgaXMgbm90CmJ1aWx0IGFuZCBz byB0aGlzIGZ1bmN0aW9uIG1heSBiZSB1bmRlZmluZWQuIEZpeCB0aGlzIGhlcmUuCgpTaWduZWQt b2ZmLWJ5OiBBbmRyZXcgRi4gRGF2aXMgPGFmZEB0aS5jb20+Ci0tLQogaW5jbHVkZS9saW51eC9s ZWRzLmggfCA4ICsrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspCgpkaWZm IC0tZ2l0IGEvaW5jbHVkZS9saW51eC9sZWRzLmggYi9pbmNsdWRlL2xpbnV4L2xlZHMuaAppbmRl eCBkMmIxMzA2Li5hNGEzZGE2IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2xlZHMuaAorKysg Yi9pbmNsdWRlL2xpbnV4L2xlZHMuaApAQCAtMzg2LDggKzM4NiwxNiBAQCBzdHJ1Y3QgZ3Bpb19s ZWRfcGxhdGZvcm1fZGF0YSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1bnNpZ25lZCBsb25nICpkZWxheV9vZmYpOwogfTsKCisjaWZkZWYgQ09ORklHX05FV19MRURT CiBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpncGlvX2xlZF9yZWdpc3Rlcl9kZXZpY2UoCiAgICAg ICAgICAgICAgICBpbnQgaWQsIGNvbnN0IHN0cnVjdCBncGlvX2xlZF9wbGF0Zm9ybV9kYXRhICpw ZGF0YSk7CisjZWxzZQorc3RhdGljIGlubGluZSBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpncGlv X2xlZF9yZWdpc3Rlcl9kZXZpY2UoCisgICAgICAgICAgICAgICBpbnQgaWQsIGNvbnN0IHN0cnVj dCBncGlvX2xlZF9wbGF0Zm9ybV9kYXRhICpwZGF0YSkKK3sKKyAgICAgICByZXR1cm4gMDsKK30K KyNlbmRpZgoKIGVudW0gY3B1X2xlZF9ldmVudCB7CiAgICAgICAgQ1BVX0xFRF9JRExFX1NUQVJU LCAgICAgLyogQ1BVIGVudGVycyBpZGxlICovCi0tIAoyLjkuMApfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eHBwYy1kZXYgbWFpbGluZyBsaXN0Ckxp bnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnCmh0dHBzOi8vbGlzdHMub3psYWJzLm9yZy9saXN0 aW5mby9saW51eHBwYy1kZXY= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bear.ext.ti.com ([198.47.19.11]:45802 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbcFTWVy (ORCPT ); Mon, 20 Jun 2016 18:21:54 -0400 Subject: [PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled To: Jacek Anaszewski References: <20160613200211.14790-1-afd@ti.com> <20160613200211.14790-13-afd@ti.com> <5760FA52.7010806@samsung.com> <57647DBD.2010406@ti.com> <57679E38.3080901@samsung.com> CC: Russell King , Miguel Ojeda Sandonis , Linus Walleij , Sebastian Reichel , Wolfram Sang , Richard Purdie , Rusty Russell , Benjamin Herrenschmidt , Mauro Carvalho Chehab , Ulf Hansson , Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz , Ingo Molnar , , , , , , , , , , From: "Andrew F. Davis" Message-ID: <57686A94.2010704@ti.com> (sfid-20160621_002244_001809_68016211) Date: Mon, 20 Jun 2016 17:13:40 -0500 MIME-Version: 1.0 In-Reply-To: <57679E38.3080901@samsung.com> Content-Type: text/plain; charset="utf-8" Sender: linux-wireless-owner@vger.kernel.org List-ID: Some systems use 'gpio_led_register_device' to make an in-memory copy of their LED device table so the original can be removed as .init.rodata. When the LED subsystem is not enabled source in the led directory is not built and so this function may be undefined. Fix this here. Signed-off-by: Andrew F. Davis --- include/linux/leds.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/leds.h b/include/linux/leds.h index d2b1306..a4a3da6 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -386,8 +386,16 @@ struct gpio_led_platform_data { unsigned long *delay_off); }; +#ifdef CONFIG_NEW_LEDS struct platform_device *gpio_led_register_device( int id, const struct gpio_led_platform_data *pdata); +#else +static inline struct platform_device *gpio_led_register_device( + int id, const struct gpio_led_platform_data *pdata) +{ + return 0; +} +#endif enum cpu_led_event { CPU_LED_IDLE_START, /* CPU enters idle */ -- 2.9.0