diff options
author | Ivo van Doorn <IvDoorn@gmail.com> | 2007-09-27 17:57:05 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:53:29 -0400 |
commit | fe242cfd3390b1c7d54d60f7ebb6a4054804cd41 (patch) | |
tree | 0a2ad56479c5a48a57c9635139b3b85de2ae5c3d | |
parent | a50e2e3f3e6303e893c4c438c0692d459d7093a5 (diff) |
[RFKILL]: Move rfkill_switch_all out of global header
rfkill_switch_all shouldn't be called by drivers directly,
instead they should send a signal over the input device.
To prevent confusion for driver developers, move the
function into a rfkill private header.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/rfkill.h | 4 | ||||
-rw-r--r-- | net/rfkill/rfkill-input.c | 2 | ||||
-rw-r--r-- | net/rfkill/rfkill-input.h | 16 | ||||
-rw-r--r-- | net/rfkill/rfkill.c | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index 8909682415dc..d76397ca95ad 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __RFKILL_H | 2 | #define __RFKILL_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * Copyright (C) 2006 Ivo van Doorn | 5 | * Copyright (C) 2006 - 2007 Ivo van Doorn |
6 | * Copyright (C) 2007 Dmitry Torokhov | 6 | * Copyright (C) 2007 Dmitry Torokhov |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
@@ -84,6 +84,4 @@ void rfkill_free(struct rfkill *rfkill); | |||
84 | int rfkill_register(struct rfkill *rfkill); | 84 | int rfkill_register(struct rfkill *rfkill); |
85 | void rfkill_unregister(struct rfkill *rfkill); | 85 | void rfkill_unregister(struct rfkill *rfkill); |
86 | 86 | ||
87 | void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state); | ||
88 | |||
89 | #endif /* RFKILL_H */ | 87 | #endif /* RFKILL_H */ |
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c index 8e4516a5fe32..eaabf087c59b 100644 --- a/net/rfkill/rfkill-input.c +++ b/net/rfkill/rfkill-input.c | |||
@@ -17,6 +17,8 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/rfkill.h> | 18 | #include <linux/rfkill.h> |
19 | 19 | ||
20 | #include "rfkill-input.h" | ||
21 | |||
20 | MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>"); | 22 | MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>"); |
21 | MODULE_DESCRIPTION("Input layer to RF switch connector"); | 23 | MODULE_DESCRIPTION("Input layer to RF switch connector"); |
22 | MODULE_LICENSE("GPL"); | 24 | MODULE_LICENSE("GPL"); |
diff --git a/net/rfkill/rfkill-input.h b/net/rfkill/rfkill-input.h new file mode 100644 index 000000000000..4dae5006fc77 --- /dev/null +++ b/net/rfkill/rfkill-input.h | |||
@@ -0,0 +1,16 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007 Ivo van Doorn | ||
3 | */ | ||
4 | |||
5 | /* | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License version 2 as published | ||
8 | * by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #ifndef __RFKILL_INPUT_H | ||
12 | #define __RFKILL_INPUT_H | ||
13 | |||
14 | void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state); | ||
15 | |||
16 | #endif /* __RFKILL_INPUT_H */ | ||
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 03ed7fd8afe0..637a9f0c7655 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2006 Ivo van Doorn | 2 | * Copyright (C) 2006 - 2007 Ivo van Doorn |
3 | * Copyright (C) 2007 Dmitry Torokhov | 3 | * Copyright (C) 2007 Dmitry Torokhov |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |