aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-12-03 19:24:47 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 15:23:22 -0500
commit5b4c4dc61d5445346b1d5465c4b4934ea933165b (patch)
treeb0be6cb65cbb3c2b1207c628a1d242d5caf08965
parentd189164a2426a5169117cfe154186c2f999ada87 (diff)
Staging: samsung-laptop: remove old kernel code
Don't test for the kernel version, we know what version we are in, the latest. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/samsung-laptop/samsung-laptop.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/drivers/staging/samsung-laptop/samsung-laptop.c b/drivers/staging/samsung-laptop/samsung-laptop.c
index 253b44754aa4..4877138a9f96 100644
--- a/drivers/staging/samsung-laptop/samsung-laptop.c
+++ b/drivers/staging/samsung-laptop/samsung-laptop.c
@@ -9,7 +9,6 @@
9 * the Free Software Foundation. 9 * the Free Software Foundation.
10 * 10 *
11 */ 11 */
12#include <linux/version.h>
13#include <linux/kernel.h> 12#include <linux/kernel.h>
14#include <linux/init.h> 13#include <linux/init.h>
15#include <linux/module.h> 14#include <linux/module.h>
@@ -274,7 +273,6 @@ static struct backlight_ops backlight_ops = {
274 .update_status = update_status, 273 .update_status = update_status,
275}; 274};
276 275
277#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
278static int rfkill_set(void *data, bool blocked) 276static int rfkill_set(void *data, bool blocked)
279{ 277{
280 /* Do something with blocked...*/ 278 /* Do something with blocked...*/
@@ -318,44 +316,6 @@ static void destroy_wireless(void)
318 rfkill_destroy(rfk); 316 rfkill_destroy(rfk);
319} 317}
320 318
321#else
322
323static int rfkill_set(void *data, enum rfkill_state state)
324{
325 if (state == RFKILL_STATE_UNBLOCKED)
326 sabi_set_command(SET_WIRELESS_BUTTON, 1);
327 else
328 sabi_set_command(SET_WIRELESS_BUTTON, 0);
329
330 return 0;
331}
332
333static int init_wireless(struct platform_device *sdev)
334{
335 int retval;
336
337 rfk = rfkill_allocate(&sdev->dev, RFKILL_TYPE_WLAN);
338 if (!rfk)
339 return -ENOMEM;
340 rfk->toggle_radio = rfkill_set;
341 rfk->name = "samsung-wifi";
342
343 retval = rfkill_register(rfk);
344 if (retval) {
345 rfkill_free(rfk);
346 return -ENODEV;
347 }
348
349 return 0;
350}
351
352static void destroy_wireless(void)
353{
354 rfkill_unregister(rfk);
355}
356
357#endif
358
359static ssize_t get_silent_state(struct device *dev, 319static ssize_t get_silent_state(struct device *dev,
360 struct device_attribute *attr, char *buf) 320 struct device_attribute *attr, char *buf)
361{ 321{