[PATCH] Revert "rfkill: remove dead code"

[PATCH] Revert "rfkill: remove dead code"

[AceLan Kao]

This reverts commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68.

Those functions are needed and should not be removed, or
there is no way to set the rfkill led trigger name.

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 include/linux/rfkill.h |   31 +++++++++++++++++++++++++++++++
 net/rfkill/core.c      |   14 ++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 6fdf027..0ec590b 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -354,6 +354,37 @@ static inline bool rfkill_blocked(struct rfkill *rfkill)
 }
 #endif /* RFKILL || RFKILL_MODULE */
 
+
+#ifdef CONFIG_RFKILL_LEDS
+/**
+ * rfkill_get_led_trigger_name - Get the LED trigger name for the button's LED.
+ * This function might return a NULL pointer if registering of the
+ * LED trigger failed. Use this as "default_trigger" for the LED.
+ */
+const char *rfkill_get_led_trigger_name(struct rfkill *rfkill);
+
+/**
+ * rfkill_set_led_trigger_name -- set the LED trigger name
+ * @rfkill: rfkill struct
+ * @name: LED trigger name
+ *
+ * This function sets the LED trigger name of the radio LED
+ * trigger that rfkill creates. It is optional, but if called
+ * must be called before rfkill_register() to be effective.
+ */
+void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name);
+#else
+static inline const char *rfkill_get_led_trigger_name(struct rfkill *rfkill)
+{
+	return NULL;
+}
+
+static inline void
+rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name)
+{
+}
+#endif
+
 #endif /* __KERNEL__ */
 
 #endif /* RFKILL_H */
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index f974961..2364064 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -150,6 +150,20 @@ static void rfkill_led_trigger_activate(struct led_classdev *led)
 	rfkill_led_trigger_event(rfkill);
 }
 
+const char *rfkill_get_led_trigger_name(struct rfkill *rfkill)
+{
+	return rfkill->led_trigger.name;
+}
+EXPORT_SYMBOL(rfkill_get_led_trigger_name);
+
+void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name)
+{
+	BUG_ON(!rfkill);
+
+	rfkill->ledtrigname = name;
+}
+EXPORT_SYMBOL(rfkill_set_led_trigger_name);
+
 static int rfkill_led_trigger_register(struct rfkill *rfkill)
 {
 	rfkill->led_trigger.name = rfkill->ledtrigname
-- 
1.7.9.5

Re: [PATCH] Revert "rfkill: remove dead code"

[Julian Calaby]

Hi AceLan,

On Thu, Jul 26, 2012 at 11:51 AM, AceLan Kao <acelan.kao@canonical.com> wrote:
> This reverts commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68.
>
> Those functions are needed and should not be removed, or
> there is no way to set the rfkill led trigger name.

Who or what is using these functions?

As I understand it, they wouldn't have been removed if any upstream
code was using them.

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/

Re: [PATCH] Revert "rfkill: remove dead code"

[AceLan Kao]

Dear Julian,

I just submitted a patch to platform-x86 for asus-wmi.
And the patch needs to use rfkill_set_led_trigger_name() function
to bind the wlan led to rfkill event.

There is no other way to set the ledtrigname if rfkill.c doesn't provide
a function for it.

Best regards,
AceLan Kao.

2012/7/26 Julian Calaby <julian.calaby@gmail.com>:
> Hi AceLan,
>
> On Thu, Jul 26, 2012 at 11:51 AM, AceLan Kao <acelan.kao@canonical.com> wrote:
>> This reverts commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68.
>>
>> Those functions are needed and should not be removed, or
>> there is no way to set the rfkill led trigger name.
>
> Who or what is using these functions?
>
> As I understand it, they wouldn't have been removed if any upstream
> code was using them.
>
> Thanks,
>
> --
> Julian Calaby
>
> Email: julian.calaby@gmail.com
> Profile: http://www.google.com/profiles/julian.calaby/
> .Plan: http://sites.google.com/site/juliancalaby/



-- 
Chia-Lin Kao(AceLan)
http://blog.acelan.idv.tw/
E-Mail: acelan.kaoATcanonical.com (s/AT/@/)

Re: [PATCH] Revert "rfkill: remove dead code"

[Julian Calaby]

Hi AceLan,

On Thu, Jul 26, 2012 at 3:55 PM, AceLan Kao <acelan.kao@canonical.com> wrote:
> Dear Julian,
>
> I just submitted a patch to platform-x86 for asus-wmi.
> And the patch needs to use rfkill_set_led_trigger_name() function
> to bind the wlan led to rfkill event.

That's what I wanted to know.

I assume that you've added a note to the ASUS-WMI patch so people know
that it needs this one first. (I can't see it here so I don't know)

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/

Re: [PATCH] Revert "rfkill: remove dead code"

[AceLan Kao]

Dear Julian,

Yes, I have said that the asus-wmi patch needs this commit
and CC'd the asus-wmi maintainer, Corentin Chary, here in this rfkill patch.

Best regards,
AceLan Kao.

2012/7/26 Julian Calaby <julian.calaby@gmail.com>:
> Hi AceLan,
>
> On Thu, Jul 26, 2012 at 3:55 PM, AceLan Kao <acelan.kao@canonical.com> wrote:
>> Dear Julian,
>>
>> I just submitted a patch to platform-x86 for asus-wmi.
>> And the patch needs to use rfkill_set_led_trigger_name() function
>> to bind the wlan led to rfkill event.
>
> That's what I wanted to know.
>
> I assume that you've added a note to the ASUS-WMI patch so people know
> that it needs this one first. (I can't see it here so I don't know)
>
> Thanks,
>
> --
> Julian Calaby
>
> Email: julian.calaby@gmail.com
> Profile: http://www.google.com/profiles/julian.calaby/
> .Plan: http://sites.google.com/site/juliancalaby/



-- 
Chia-Lin Kao(AceLan)
http://blog.acelan.idv.tw/
E-Mail: acelan.kaoATcanonical.com (s/AT/@/)

Re: [PATCH] Revert "rfkill: remove dead code"

[John W. Linville]

Is this all sorted?  Is this patch going through the platform tree?

On Thu, Jul 26, 2012 at 02:19:23PM +0800, AceLan Kao wrote:
> Dear Julian,
> 
> Yes, I have said that the asus-wmi patch needs this commit
> and CC'd the asus-wmi maintainer, Corentin Chary, here in this rfkill patch.
> 
> Best regards,
> AceLan Kao.
> 
> 2012/7/26 Julian Calaby <julian.calaby@gmail.com>:
> > Hi AceLan,
> >
> > On Thu, Jul 26, 2012 at 3:55 PM, AceLan Kao <acelan.kao@canonical.com> wrote:
> >> Dear Julian,
> >>
> >> I just submitted a patch to platform-x86 for asus-wmi.
> >> And the patch needs to use rfkill_set_led_trigger_name() function
> >> to bind the wlan led to rfkill event.
> >
> > That's what I wanted to know.
> >
> > I assume that you've added a note to the ASUS-WMI patch so people know
> > that it needs this one first. (I can't see it here so I don't know)
> >
> > Thanks,
> >
> > --
> > Julian Calaby
> >
> > Email: julian.calaby@gmail.com
> > Profile: http://www.google.com/profiles/julian.calaby/
> > .Plan: http://sites.google.com/site/juliancalaby/
> 
> 
> 
> -- 
> Chia-Lin Kao(AceLan)
> http://blog.acelan.idv.tw/
> E-Mail: acelan.kaoATcanonical.com (s/AT/@/)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH] Revert "rfkill: remove dead code"

[AceLan Kao]

No, I only submit the patch here, and the asus-wmi patch for platform is waiting
this patch into kernel first.

2012/8/14 John W. Linville <linville@tuxdriver.com>:
> Is this all sorted?  Is this patch going through the platform tree?
>
> On Thu, Jul 26, 2012 at 02:19:23PM +0800, AceLan Kao wrote:
>> Dear Julian,
>>
>> Yes, I have said that the asus-wmi patch needs this commit
>> and CC'd the asus-wmi maintainer, Corentin Chary, here in this rfkill patch.
>>
>> Best regards,
>> AceLan Kao.
>>
>> 2012/7/26 Julian Calaby <julian.calaby@gmail.com>:
>> > Hi AceLan,
>> >
>> > On Thu, Jul 26, 2012 at 3:55 PM, AceLan Kao <acelan.kao@canonical.com> wrote:
>> >> Dear Julian,
>> >>
>> >> I just submitted a patch to platform-x86 for asus-wmi.
>> >> And the patch needs to use rfkill_set_led_trigger_name() function
>> >> to bind the wlan led to rfkill event.
>> >
>> > That's what I wanted to know.
>> >
>> > I assume that you've added a note to the ASUS-WMI patch so people know
>> > that it needs this one first. (I can't see it here so I don't know)
>> >
>> > Thanks,
>> >
>> > --
>> > Julian Calaby
>> >
>> > Email: julian.calaby@gmail.com
>> > Profile: http://www.google.com/profiles/julian.calaby/
>> > .Plan: http://sites.google.com/site/juliancalaby/
>>
>>
>>
>> --
>> Chia-Lin Kao(AceLan)
>> http://blog.acelan.idv.tw/
>> E-Mail: acelan.kaoATcanonical.com (s/AT/@/)
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>
> --
> John W. Linville                Someday the world will need a hero, and you
> linville@tuxdriver.com                  might be all we have.  Be ready.



-- 
Chia-Lin Kao(AceLan)
http://blog.acelan.idv.tw/
E-Mail: acelan.kaoATcanonical.com (s/AT/@/)

Re: [PATCH] Revert "rfkill: remove dead code"

[AceLan Kao]

Hi,

I didn't see this patch in linux-next nor in Linville's tree,and this
patch is needed by the asus-wmi driver.
Please help to merge this patch earlier, so that platform-x86 can get
rid of the compiling error.
Thank you very much.

Best regards,
AceLan Kao.

2012/8/14 AceLan Kao <acelan.kao@canonical.com>:
> No, I only submit the patch here, and the asus-wmi patch for platform is waiting
> this patch into kernel first.
>
> 2012/8/14 John W. Linville <linville@tuxdriver.com>:
>> Is this all sorted?  Is this patch going through the platform tree?
>>
>> On Thu, Jul 26, 2012 at 02:19:23PM +0800, AceLan Kao wrote:
>>> Dear Julian,
>>>
>>> Yes, I have said that the asus-wmi patch needs this commit
>>> and CC'd the asus-wmi maintainer, Corentin Chary, here in this rfkill patch.
>>>
>>> Best regards,
>>> AceLan Kao.
>>>
>>> 2012/7/26 Julian Calaby <julian.calaby@gmail.com>:
>>> > Hi AceLan,
>>> >
>>> > On Thu, Jul 26, 2012 at 3:55 PM, AceLan Kao <acelan.kao@canonical.com> wrote:
>>> >> Dear Julian,
>>> >>
>>> >> I just submitted a patch to platform-x86 for asus-wmi.
>>> >> And the patch needs to use rfkill_set_led_trigger_name() function
>>> >> to bind the wlan led to rfkill event.
>>> >
>>> > That's what I wanted to know.
>>> >
>>> > I assume that you've added a note to the ASUS-WMI patch so people know
>>> > that it needs this one first. (I can't see it here so I don't know)
>>> >
>>> > Thanks,
>>> >
>>> > --
>>> > Julian Calaby
>>> >
>>> > Email: julian.calaby@gmail.com
>>> > Profile: http://www.google.com/profiles/julian.calaby/
>>> > .Plan: http://sites.google.com/site/juliancalaby/
>>>
>>>
>>>
>>> --
>>> Chia-Lin Kao(AceLan)
>>> http://blog.acelan.idv.tw/
>>> E-Mail: acelan.kaoATcanonical.com (s/AT/@/)
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>
>>
>> --
>> John W. Linville                Someday the world will need a hero, and you
>> linville@tuxdriver.com                  might be all we have.  Be ready.
>
>
>
> --
> Chia-Lin Kao(AceLan)
> http://blog.acelan.idv.tw/
> E-Mail: acelan.kaoATcanonical.com (s/AT/@/)



-- 
Chia-Lin Kao(AceLan)
http://blog.acelan.idv.tw/
E-Mail: acelan.kaoATcanonical.com (s/AT/@/)

Re: [PATCH] Revert "rfkill: remove dead code"

[Johannes Berg]

On Mon, 2012-08-20 at 10:11 +0800, AceLan Kao wrote:
> Hi,
> 
> I didn't see this patch in linux-next nor in Linville's tree,and this
> patch is needed by the asus-wmi driver.
> Please help to merge this patch earlier, so that platform-x86 can get
> rid of the compiling error.
> Thank you very much.

I have no objections to this -- should I pick it up, John?

johannes

Re: [PATCH] Revert "rfkill: remove dead code"

[John W. Linville]

On Mon, Aug 20, 2012 at 12:33:56PM +0200, Johannes Berg wrote:
> On Mon, 2012-08-20 at 10:11 +0800, AceLan Kao wrote:
> > Hi,
> > 
> > I didn't see this patch in linux-next nor in Linville's tree,and this
> > patch is needed by the asus-wmi driver.
> > Please help to merge this patch earlier, so that platform-x86 can get
> > rid of the compiling error.
> > Thank you very much.
> 
> I have no objections to this -- should I pick it up, John?

Sure, that sounds great.

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.