Commit 02f7f179 authored by Andrew Morton's avatar Andrew Morton Committed by John W. Linville

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 16cec43d
...@@ -579,6 +579,8 @@ static ssize_t rfkill_name_show(struct device *dev, ...@@ -579,6 +579,8 @@ static ssize_t rfkill_name_show(struct device *dev,
static const char *rfkill_get_type_str(enum rfkill_type type) static const char *rfkill_get_type_str(enum rfkill_type type)
{ {
BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
switch (type) { switch (type) {
case RFKILL_TYPE_WLAN: case RFKILL_TYPE_WLAN:
return "wlan"; return "wlan";
...@@ -597,8 +599,6 @@ static const char *rfkill_get_type_str(enum rfkill_type type) ...@@ -597,8 +599,6 @@ static const char *rfkill_get_type_str(enum rfkill_type type)
default: default:
BUG(); BUG();
} }
BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
} }
static ssize_t rfkill_type_show(struct device *dev, static ssize_t rfkill_type_show(struct device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment