diff options
Diffstat (limited to 'drivers/platform/x86/ideapad-laptop.c')
| -rw-r--r-- | drivers/platform/x86/ideapad-laptop.c | 13 | 
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index 5ff4f2e314d..64bfb30a52e 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 = {  	.release = single_release,  }; -static int __devinit ideapad_debugfs_init(struct ideapad_private *priv) +static int ideapad_debugfs_init(struct ideapad_private *priv)  {  	struct dentry *node; @@ -468,8 +468,7 @@ static void ideapad_sync_rfk_state(struct ideapad_private *priv)  			rfkill_set_hw_state(priv->rfk[i], hw_blocked);  } -static int __devinit ideapad_register_rfkill(struct acpi_device *adevice, -					     int dev) +static int ideapad_register_rfkill(struct acpi_device *adevice, int dev)  {  	struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);  	int ret; @@ -519,7 +518,7 @@ static void ideapad_unregister_rfkill(struct acpi_device *adevice, int dev)  /*   * Platform device   */ -static int __devinit ideapad_platform_init(struct ideapad_private *priv) +static int ideapad_platform_init(struct ideapad_private *priv)  {  	int result; @@ -569,7 +568,7 @@ static const struct key_entry ideapad_keymap[] = {  	{ KE_END, 0 },  }; -static int __devinit ideapad_input_init(struct ideapad_private *priv) +static int ideapad_input_init(struct ideapad_private *priv)  {  	struct input_dev *inputdev;  	int error; @@ -776,7 +775,7 @@ static void ideapad_sync_touchpad_state(struct acpi_device *adevice)  	}  } -static int __devinit ideapad_acpi_add(struct acpi_device *adevice) +static int ideapad_acpi_add(struct acpi_device *adevice)  {  	int ret, i;  	int cfg; @@ -835,7 +834,7 @@ platform_failed:  	return ret;  } -static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type) +static int ideapad_acpi_remove(struct acpi_device *adevice, int type)  {  	struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);  	int i;  |