Commit 02f7f179 authored Dec 03, 2009 by Andrew Morton Committed by John W. Linville Dec 07, 2009

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>

parent 16cec43d

net/rfkill/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,