Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d7de83 authored by AceLan Kao's avatar AceLan Kao Committed by Johannes Berg
Browse files

Revert "rfkill: remove dead code" 



This reverts commit 2e48928d.

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

Signed-off-by: default avatarAceLan Kao <acelan.kao@canonical.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dcf33963

include/linux/rfkill.h

+31 −0
Original line number Diff line number Diff line
@@ -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 */

net/rfkill/core.c

+14 −0
Original line number Diff line number Diff line
@@ -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