aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/ideapad-laptop.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/platform/x86/ideapad-laptop.c')
-rw-r--r--drivers/platform/x86/ideapad-laptop.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 5ff4f2e314d2..64bfb30a52e9 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -298,7 +298,7 @@ static const struct file_operations debugfs_cfg_fops = {
298 .release = single_release, 298 .release = single_release,
299}; 299};
300 300
301static int __devinit ideapad_debugfs_init(struct ideapad_private *priv) 301static int ideapad_debugfs_init(struct ideapad_private *priv)
302{ 302{
303 struct dentry *node; 303 struct dentry *node;
304 304
@@ -468,8 +468,7 @@ static void ideapad_sync_rfk_state(struct ideapad_private *priv)
468 rfkill_set_hw_state(priv->rfk[i], hw_blocked); 468 rfkill_set_hw_state(priv->rfk[i], hw_blocked);
469} 469}
470 470
471static int __devinit ideapad_register_rfkill(struct acpi_device *adevice, 471static int ideapad_register_rfkill(struct acpi_device *adevice, int dev)
472 int dev)
473{ 472{
474 struct ideapad_private *priv = dev_get_drvdata(&adevice->dev); 473 struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
475 int ret; 474 int ret;
@@ -519,7 +518,7 @@ static void ideapad_unregister_rfkill(struct acpi_device *adevice, int dev)
519/* 518/*
520 * Platform device 519 * Platform device
521 */ 520 */
522static int __devinit ideapad_platform_init(struct ideapad_private *priv) 521static int ideapad_platform_init(struct ideapad_private *priv)
523{ 522{
524 int result; 523 int result;
525 524
@@ -569,7 +568,7 @@ static const struct key_entry ideapad_keymap[] = {
569 { KE_END, 0 }, 568 { KE_END, 0 },
570}; 569};
571 570
572static int __devinit ideapad_input_init(struct ideapad_private *priv) 571static int ideapad_input_init(struct ideapad_private *priv)
573{ 572{
574 struct input_dev *inputdev; 573 struct input_dev *inputdev;
575 int error; 574 int error;
@@ -776,7 +775,7 @@ static void ideapad_sync_touchpad_state(struct acpi_device *adevice)
776 } 775 }
777} 776}
778 777
779static int __devinit ideapad_acpi_add(struct acpi_device *adevice) 778static int ideapad_acpi_add(struct acpi_device *adevice)
780{ 779{
781 int ret, i; 780 int ret, i;
782 int cfg; 781 int cfg;
@@ -835,7 +834,7 @@ platform_failed:
835 return ret; 834 return ret;
836} 835}
837 836
838static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type) 837static int ideapad_acpi_remove(struct acpi_device *adevice, int type)
839{ 838{
840 struct ideapad_private *priv = dev_get_drvdata(&adevice->dev); 839 struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
841 int i; 840 int i;