summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2009-12-04 07:45:07 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-12-08 00:51:23 +0300
commit02f7f1793023bd8e5e277ad349f6f43f8c284fb0 (patch)
tree20ddc6990b49b2bdae0bf6c324348922e1c30201 /net
parent16cec43da50c4b4702653ca710549fd3457a4e6c (diff)
downloadlinux-02f7f1793023bd8e5e277ad349f6f43f8c284fb0.tar.xz
net/rfkill/core.c: work around gcc-4.0.2 silliness
net/rfkill/core.c: In function 'rfkill_type_show': net/rfkill/core.c:610: warning: control may reach end of non-void function 'rfkill_get_type_str' being inlined A gcc bug, but simple enough to squish. Cc: John W. Linville <linville@tuxdriver.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/rfkill/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 448e5a0fcc2e..c218e07e5caf 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -579,6 +579,8 @@ static ssize_t rfkill_name_show(struct device *dev,
static const char *rfkill_get_type_str(enum rfkill_type type)
{
+ BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
+
switch (type) {
case RFKILL_TYPE_WLAN:
return "wlan";
@@ -597,8 +599,6 @@ static const char *rfkill_get_type_str(enum rfkill_type type)
default:
BUG();
}
-
- BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
}
static ssize_t rfkill_type_show(struct device *dev,