diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2009-12-03 23:45:07 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-07 16:51:23 -0500 |
| commit | 02f7f1793023bd8e5e277ad349f6f43f8c284fb0 (patch) | |
| tree | 20ddc6990b49b2bdae0bf6c324348922e1c30201 /net/rfkill | |
| parent | 16cec43da50c4b4702653ca710549fd3457a4e6c (diff) | |
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/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 4 |
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, | |||
| 579 | 579 | ||
| 580 | static const char *rfkill_get_type_str(enum rfkill_type type) | 580 | static const char *rfkill_get_type_str(enum rfkill_type type) |
| 581 | { | 581 | { |
| 582 | BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); | ||
| 583 | |||
| 582 | switch (type) { | 584 | switch (type) { |
| 583 | case RFKILL_TYPE_WLAN: | 585 | case RFKILL_TYPE_WLAN: |
| 584 | return "wlan"; | 586 | return "wlan"; |
| @@ -597,8 +599,6 @@ static const char *rfkill_get_type_str(enum rfkill_type type) | |||
| 597 | default: | 599 | default: |
| 598 | BUG(); | 600 | BUG(); |
| 599 | } | 601 | } |
| 600 | |||
| 601 | BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); | ||
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | static ssize_t rfkill_type_show(struct device *dev, | 604 | static ssize_t rfkill_type_show(struct device *dev, |
