From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Andrew F. Davis" Subject: Re: [PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled Date: Tue, 21 Jun 2016 06:48:10 -0500 Message-ID: <5769297A.4050608@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> <57686A94.2010704@ti.com> <5768E815.5080706@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <5768E815.5080706@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 T24gMDYvMjEvMjAxNiAwMjowOSBBTSwgSmFjZWsgQW5hc3pld3NraSB3cm90ZToKPiBIaSBBbmRy ZXcsCj4gCj4gVGhpcyBwYXRjaCBkb2Vzbid0IGFwcGx5LCBwbGVhc2UgcmViYXNlIG9udG8gcmVj ZW50IExFRCB0cmVlLgo+IAo+IE9uIDA2LzIxLzIwMTYgMTI6MTMgQU0sIEFuZHJldyBGLiBEYXZp cyB3cm90ZToKPj4gU29tZSBzeXN0ZW1zIHVzZSAnZ3Bpb19sZWRfcmVnaXN0ZXJfZGV2aWNlJyB0 byBtYWtlIGFuIGluLW1lbW9yeSBjb3B5IG9mCj4+IHRoZWlyIExFRCBkZXZpY2UgdGFibGUgc28g dGhlIG9yaWdpbmFsIGNhbiBiZSByZW1vdmVkIGFzIC5pbml0LnJvZGF0YS4KPj4gV2hlbiB0aGUg TEVEIHN1YnN5c3RlbSBpcyBub3QgZW5hYmxlZCBzb3VyY2UgaW4gdGhlIGxlZCBkaXJlY3Rvcnkg aXMgbm90Cj4+IGJ1aWx0IGFuZCBzbyB0aGlzIGZ1bmN0aW9uIG1heSBiZSB1bmRlZmluZWQuIEZp eCB0aGlzIGhlcmUuCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IEFuZHJldyBGLiBEYXZpcyA8YWZkQHRp LmNvbT4KPj4gLS0tCj4+ICAgaW5jbHVkZS9saW51eC9sZWRzLmggfCA4ICsrKysrKysrCj4+ICAg MSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvaW5jbHVk ZS9saW51eC9sZWRzLmggYi9pbmNsdWRlL2xpbnV4L2xlZHMuaAo+PiBpbmRleCBkMmIxMzA2Li5h NGEzZGE2IDEwMDY0NAo+PiAtLS0gYS9pbmNsdWRlL2xpbnV4L2xlZHMuaAo+PiArKysgYi9pbmNs dWRlL2xpbnV4L2xlZHMuaAo+PiBAQCAtMzg2LDggKzM4NiwxNiBAQCBzdHJ1Y3QgZ3Bpb19sZWRf cGxhdGZvcm1fZGF0YSB7Cj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgbG9uZyAqZGVsYXlfb2ZmKTsKPiAKPiBDdXJyZW50bHkgdGhlcmUgaXMgc29t ZSBzdHVmZiBoZXJlLCBhbmQgaW4gZmFjdCBpdCBoYXMgYmVlbiBmb3IKPiBhIGxvbmcgdGltZS4K PiAKPiBQYXRjaCAiW1BBVENIIDEyLzEyXSBsZWRzOiBPbmx5IGRlc2NlbmQgaW50byBsZWRzIGRp cmVjdG9yeSB3aGVuCj4gQ09ORklHX05FV19MRURTIGlzIHNldCIgYWxzbyBkb2Vzbid0IGFwcGx5 Lgo+IFdoYXQgcmVwb3NpdG9yeSBhcmUgeW91IHVzaW5nPwo+IAoKdjQuNy1yYzQsIGl0IG1heSBu b3QgYXBwbHkgZHVlIHRvIHRoZSBzdXJyb3VuZGluZyBsaW5lcyBiZWluZyBjaGFuZ2VkIGluCnRo ZSBvdGhlciBwYXRjaGVzIHdoaWNoIG1heSBub3QgYmUgYXBwbGllZCB0byB5b3VyIHRyZWUuIEl0 IGlzIGEgc2luZ2xlCmxpbmUgY2hhbmdlIHBlciBwYXRjaCBzbyBob3BlZnVsbHkgdGhlIG1lcmdl IGNvbmZsaWN0IHJlc29sdXRpb25zIHdpbGwKYmUgdHJpdmlhbC4KCkEgYmV0dGVyIHNvbHV0aW9u IGNvdWxkIGhhdmUgYmVlbiBnZXR0aW5nIGFuIGFjayBmcm9tIGVhY2ggbWFpbnRhaW5lcgphbmQg aGF2aW5nIHNvbWVvbmUgcHVsbCB0aGUgd2hvbGUgc2VyaWVzIGludG8gb25lIHRyZWUsIGJ1dCBw YXJ0cyBoYXZlCmFscmVhZHkgYmVlbiBwaWNrZWQgc28gaXQgbWF5IGJlIGEgbGl0dGxlIGxhdGUg Zm9yIHRoYXQuCgo+PiAgIH07Cj4+Cj4+ICsjaWZkZWYgQ09ORklHX05FV19MRURTCj4+ICAgc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqZ3Bpb19sZWRfcmVnaXN0ZXJfZGV2aWNlKAo+PiAgICAgICAg ICAgICAgICAgIGludCBpZCwgY29uc3Qgc3RydWN0IGdwaW9fbGVkX3BsYXRmb3JtX2RhdGEgKnBk YXRhKTsKPj4gKyNlbHNlCj4+ICtzdGF0aWMgaW5saW5lIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KmdwaW9fbGVkX3JlZ2lzdGVyX2RldmljZSgKPj4gKyAgICAgICAgICAgICAgIGludCBpZCwgY29u c3Qgc3RydWN0IGdwaW9fbGVkX3BsYXRmb3JtX2RhdGEgKnBkYXRhKQo+PiArewo+PiArICAgICAg IHJldHVybiAwOwo+PiArfQo+PiArI2VuZGlmCj4+Cj4+ICAgZW51bSBjcHVfbGVkX2V2ZW50IHsK Pj4gICAgICAgICAgQ1BVX0xFRF9JRExFX1NUQVJULCAgICAgLyogQ1BVIGVudGVycyBpZGxlICov Cj4+Cj4gCj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkxpbnV4cHBjLWRldiBtYWlsaW5nIGxpc3QKTGludXhwcGMtZGV2QGxpc3RzLm96bGFicy5vcmcK aHR0cHM6Ly9saXN0cy5vemxhYnMub3JnL2xpc3RpbmZvL2xpbnV4cHBjLWRldg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from arroyo.ext.ti.com ([198.47.19.12]:38314 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434AbcFUMBc (ORCPT ); Tue, 21 Jun 2016 08:01:32 -0400 Subject: Re: [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> <57686A94.2010704@ti.com> <5768E815.5080706@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: <5769297A.4050608@ti.com> (sfid-20160621_140138_256941_8C7AD5D3) Date: Tue, 21 Jun 2016 06:48:10 -0500 MIME-Version: 1.0 In-Reply-To: <5768E815.5080706@samsung.com> Content-Type: text/plain; charset="utf-8" Sender: linux-wireless-owner@vger.kernel.org List-ID: On 06/21/2016 02:09 AM, Jacek Anaszewski wrote: > Hi Andrew, > > This patch doesn't apply, please rebase onto recent LED tree. > > On 06/21/2016 12:13 AM, Andrew F. Davis wrote: >> 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); > > Currently there is some stuff here, and in fact it has been for > a long time. > > Patch "[PATCH 12/12] leds: Only descend into leds directory when > CONFIG_NEW_LEDS is set" also doesn't apply. > What repository are you using? > v4.7-rc4, it may not apply due to the surrounding lines being changed in the other patches which may not be applied to your tree. It is a single line change per patch so hopefully the merge conflict resolutions will be trivial. A better solution could have been getting an ack from each maintainer and having someone pull the whole series into one tree, but parts have already been picked so it may be a little late for that. >> }; >> >> +#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 */ >> > >