lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ideapad: pass ideapad_priv as argument (part 1)

Browse Source 
Passing ideapad_priv as argument and try not to using too much global variable.
This is part 1 for platform driver and input device.

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Ike Panhc
2010-12-13 18:01:01 +08:00
committed by Matthew Garrett
parent a4b5a2794a
commit 8693ae846c
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/platform/x86/ideapad-laptop.c
View File

@@ -301,37 +301,37 @@ static struct attribute_group ideapad_attribute_group = {
.attrs = ideapad_attributes .attrs = ideapad_attributes
}; };
static int __devinit ideapad_platform_init(void) static int __devinit ideapad_platform_init(struct ideapad_private *priv)
{ {
int result; int result;
ideapad_priv->platform_device = platform_device_alloc("ideapad", -1); priv->platform_device = platform_device_alloc("ideapad", -1);
if (!ideapad_priv->platform_device) if (!priv->platform_device)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(ideapad_priv->platform_device, ideapad_priv); platform_set_drvdata(priv->platform_device, priv);
result = platform_device_add(ideapad_priv->platform_device); result = platform_device_add(priv->platform_device);
if (result) if (result)
goto fail_platform_device; goto fail_platform_device;
result = sysfs_create_group(&ideapad_priv->platform_device->dev.kobj, result = sysfs_create_group(&priv->platform_device->dev.kobj,
&ideapad_attribute_group); &ideapad_attribute_group);
if (result) if (result)
goto fail_sysfs; goto fail_sysfs;
return 0; return 0;
fail_sysfs: fail_sysfs:
platform_device_del(ideapad_priv->platform_device); platform_device_del(priv->platform_device);
fail_platform_device: fail_platform_device:
platform_device_put(ideapad_priv->platform_device); platform_device_put(priv->platform_device);
return result; return result;
} }
static void ideapad_platform_exit(void) static void ideapad_platform_exit(struct ideapad_private *priv)
{ {
sysfs_remove_group(&ideapad_priv->platform_device->dev.kobj, sysfs_remove_group(&priv->platform_device->dev.kobj,
&ideapad_attribute_group); &ideapad_attribute_group);
platform_device_unregister(ideapad_priv->platform_device); platform_device_unregister(priv->platform_device);
} }
/* /*
@@ -343,7 +343,7 @@ static const struct key_entry ideapad_keymap[] = {
{ KE_END, 0 }, { KE_END, 0 },
}; };
static int __devinit ideapad_input_init(void) static int __devinit ideapad_input_init(struct ideapad_private *priv)
{ {
struct input_dev *inputdev; struct input_dev *inputdev;
int error; int error;
@@ -357,7 +357,7 @@ static int __devinit ideapad_input_init(void)
inputdev->name = "Ideapad extra buttons"; inputdev->name = "Ideapad extra buttons";
inputdev->phys = "ideapad/input0"; inputdev->phys = "ideapad/input0";
inputdev->id.bustype = BUS_HOST; inputdev->id.bustype = BUS_HOST;
inputdev->dev.parent = &ideapad_priv->platform_device->dev; inputdev->dev.parent = &priv->platform_device->dev;
error = sparse_keymap_setup(inputdev, ideapad_keymap, NULL); error = sparse_keymap_setup(inputdev, ideapad_keymap, NULL);
if (error) { if (error) {
@@ -371,7 +371,7 @@ static int __devinit ideapad_input_init(void)
goto err_free_keymap; goto err_free_keymap;
} }
ideapad_priv->inputdev = inputdev; priv->inputdev = inputdev;
return 0; return 0;
err_free_keymap: err_free_keymap:
@@ -381,16 +381,17 @@ err_free_dev:
return error; return error;
} }
static void __devexit ideapad_input_exit(void) static void __devexit ideapad_input_exit(struct ideapad_private *priv)
{ {
sparse_keymap_free(ideapad_priv->inputdev); sparse_keymap_free(priv->inputdev);
input_unregister_device(ideapad_priv->inputdev); input_unregister_device(priv->inputdev);
ideapad_priv->inputdev = NULL; priv->inputdev = NULL;
} }
static void ideapad_input_report(unsigned long scancode) static void ideapad_input_report(struct ideapad_private *priv,
unsigned long scancode)
{ {
sparse_keymap_report_event(ideapad_priv->inputdev, scancode, 1, true); sparse_keymap_report_event(priv->inputdev, scancode, 1, true);
} }
/* /*
@@ -417,11 +418,11 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
priv->handle = adevice->handle; priv->handle = adevice->handle;
dev_set_drvdata(&adevice->dev, priv); dev_set_drvdata(&adevice->dev, priv);
ret = ideapad_platform_init(); ret = ideapad_platform_init(priv);
if (ret) if (ret)
goto platform_failed; goto platform_failed;
ret = ideapad_input_init(); ret = ideapad_input_init(priv);
if (ret) if (ret)
goto input_failed; goto input_failed;
@@ -434,7 +435,7 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
return 0; return 0;
input_failed: input_failed:
ideapad_platform_exit(); ideapad_platform_exit(priv);
platform_failed: platform_failed:
kfree(priv); kfree(priv);
return ret; return ret;
@@ -447,8 +448,8 @@ static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type)
for (i = IDEAPAD_DEV_WLAN; i < IDEAPAD_DEV_KILLSW; i++) for (i = IDEAPAD_DEV_WLAN; i < IDEAPAD_DEV_KILLSW; i++)
ideapad_unregister_rfkill(adevice, i); ideapad_unregister_rfkill(adevice, i);
ideapad_input_exit(); ideapad_input_exit(priv);
ideapad_platform_exit(); ideapad_platform_exit(priv);
dev_set_drvdata(&adevice->dev, NULL); dev_set_drvdata(&adevice->dev, NULL);
kfree(priv); kfree(priv);
@@ -457,6 +458,7 @@ static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type)
static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event) static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
{ {
struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
acpi_handle handle = adevice->handle; acpi_handle handle = adevice->handle;
unsigned long vpc1, vpc2, vpc_bit; unsigned long vpc1, vpc2, vpc_bit;
@@ -471,7 +473,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
if (vpc_bit == 9) if (vpc_bit == 9)
ideapad_sync_rfk_state(adevice); ideapad_sync_rfk_state(adevice);
else else
ideapad_input_report(vpc_bit); ideapad_input_report(priv, vpc_bit);
} }
} }
} }