Skip to content

Commit

Permalink
Staging: samsung-laptop: remove old kernel code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Dec 11, 2009
1 parent d189164 commit 5b4c4dc
Showing 1 changed file with 0 additions and 40 deletions.
40 changes: 0 additions & 40 deletions drivers/staging/samsung-laptop/samsung-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* the Free Software Foundation.
*
*/
#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
Expand Down Expand Up @@ -274,7 +273,6 @@ static struct backlight_ops backlight_ops = {
.update_status = update_status,
};

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
static int rfkill_set(void *data, bool blocked)
{
/* Do something with blocked...*/
Expand Down Expand Up @@ -318,44 +316,6 @@ static void destroy_wireless(void)
rfkill_destroy(rfk);
}

#else

static int rfkill_set(void *data, enum rfkill_state state)
{
if (state == RFKILL_STATE_UNBLOCKED)
sabi_set_command(SET_WIRELESS_BUTTON, 1);
else
sabi_set_command(SET_WIRELESS_BUTTON, 0);

return 0;
}

static int init_wireless(struct platform_device *sdev)
{
int retval;

rfk = rfkill_allocate(&sdev->dev, RFKILL_TYPE_WLAN);
if (!rfk)
return -ENOMEM;
rfk->toggle_radio = rfkill_set;
rfk->name = "samsung-wifi";

retval = rfkill_register(rfk);
if (retval) {
rfkill_free(rfk);
return -ENODEV;
}

return 0;
}

static void destroy_wireless(void)
{
rfkill_unregister(rfk);
}

#endif

static ssize_t get_silent_state(struct device *dev,
struct device_attribute *attr, char *buf)
{
Expand Down

0 comments on commit 5b4c4dc

Please sign in to comment.