aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/rfkill.h5
-rw-r--r--net/rfkill/rfkill.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index aa3c7d5852f6..e92d8e94bb88 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -110,9 +110,10 @@ struct rfkill {
110}; 110};
111#define to_rfkill(d) container_of(d, struct rfkill, dev) 111#define to_rfkill(d) container_of(d, struct rfkill, dev)
112 112
113struct rfkill *rfkill_allocate(struct device *parent, enum rfkill_type type); 113struct rfkill * __must_check rfkill_allocate(struct device *parent,
114 enum rfkill_type type);
114void rfkill_free(struct rfkill *rfkill); 115void rfkill_free(struct rfkill *rfkill);
115int rfkill_register(struct rfkill *rfkill); 116int __must_check rfkill_register(struct rfkill *rfkill);
116void rfkill_unregister(struct rfkill *rfkill); 117void rfkill_unregister(struct rfkill *rfkill);
117 118
118int rfkill_force_state(struct rfkill *rfkill, enum rfkill_state state); 119int rfkill_force_state(struct rfkill *rfkill, enum rfkill_state state);
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index b995fa32cf84..fae7ffade9c9 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -645,7 +645,8 @@ static void rfkill_remove_switch(struct rfkill *rfkill)
645 * NOTE: If registration fails the structure shoudl be freed by calling 645 * NOTE: If registration fails the structure shoudl be freed by calling
646 * rfkill_free() otherwise rfkill_unregister() should be used. 646 * rfkill_free() otherwise rfkill_unregister() should be used.
647 */ 647 */
648struct rfkill *rfkill_allocate(struct device *parent, enum rfkill_type type) 648struct rfkill * __must_check rfkill_allocate(struct device *parent,
649 enum rfkill_type type)
649{ 650{
650 struct rfkill *rfkill; 651 struct rfkill *rfkill;
651 struct device *dev; 652 struct device *dev;
@@ -716,7 +717,7 @@ static void rfkill_led_trigger_unregister(struct rfkill *rfkill)
716 * structure needs to be registered. Immediately from registration the 717 * structure needs to be registered. Immediately from registration the
717 * switch driver should be able to service calls to toggle_radio. 718 * switch driver should be able to service calls to toggle_radio.
718 */ 719 */
719int rfkill_register(struct rfkill *rfkill) 720int __must_check rfkill_register(struct rfkill *rfkill)
720{ 721{
721 static atomic_t rfkill_no = ATOMIC_INIT(0); 722 static atomic_t rfkill_no = ATOMIC_INIT(0);
722 struct device *dev = &rfkill->dev; 723 struct device *dev = &rfkill->dev;