提交 98ee6919 编写于 作者: I Ike Panhc 提交者: Matthew Garrett

ideapad: add platform driver for ideapad

Create /sys/devices/platform/ideapad for nodes of ideapad landing.
Signed-off-by: NIke Panhc <ike.pan@canonical.com>
Signed-off-by: NMatthew Garrett <mjg@redhat.com>
上级 9c232250
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/platform_device.h>
#define IDEAPAD_DEV_CAMERA 0 #define IDEAPAD_DEV_CAMERA 0
#define IDEAPAD_DEV_WLAN 1 #define IDEAPAD_DEV_WLAN 1
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
struct ideapad_private { struct ideapad_private {
acpi_handle handle; acpi_handle handle;
struct rfkill *rfk[5]; struct rfkill *rfk[5];
struct platform_device *platform_device;
} *ideapad_priv; } *ideapad_priv;
static struct { static struct {
...@@ -277,6 +279,35 @@ static void ideapad_unregister_rfkill(struct acpi_device *adevice, int dev) ...@@ -277,6 +279,35 @@ static void ideapad_unregister_rfkill(struct acpi_device *adevice, int dev)
rfkill_destroy(priv->rfk[dev]); rfkill_destroy(priv->rfk[dev]);
} }
/*
* Platform device
*/
static int __devinit ideapad_platform_init(void)
{
int result;
ideapad_priv->platform_device = platform_device_alloc("ideapad", -1);
if (!ideapad_priv->platform_device)
return -ENOMEM;
platform_set_drvdata(ideapad_priv->platform_device, ideapad_priv);
result = platform_device_add(ideapad_priv->platform_device);
if (result)
goto fail_platform_device;
return 0;
fail_platform_device:
platform_device_put(ideapad_priv->platform_device);
return result;
}
static void ideapad_platform_exit(void)
{
platform_device_unregister(ideapad_priv->platform_device);
}
/* the above is platform device */
static const struct acpi_device_id ideapad_device_ids[] = { static const struct acpi_device_id ideapad_device_ids[] = {
{ "VPC2004", 0}, { "VPC2004", 0},
{ "", 0}, { "", 0},
...@@ -285,7 +316,7 @@ MODULE_DEVICE_TABLE(acpi, ideapad_device_ids); ...@@ -285,7 +316,7 @@ MODULE_DEVICE_TABLE(acpi, ideapad_device_ids);
static int ideapad_acpi_add(struct acpi_device *adevice) static int ideapad_acpi_add(struct acpi_device *adevice)
{ {
int i, cfg; int ret, i, cfg;
int devs_present[5]; int devs_present[5];
struct ideapad_private *priv; struct ideapad_private *priv;
...@@ -305,18 +336,20 @@ static int ideapad_acpi_add(struct acpi_device *adevice) ...@@ -305,18 +336,20 @@ static int ideapad_acpi_add(struct acpi_device *adevice)
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
ideapad_priv = priv;
ret = ideapad_platform_init();
if (ret)
goto platform_failed;
if (devs_present[IDEAPAD_DEV_CAMERA]) { if (devs_present[IDEAPAD_DEV_CAMERA]) {
int ret = device_create_file(&adevice->dev, &dev_attr_camera_power); ret = device_create_file(&adevice->dev, &dev_attr_camera_power);
if (ret) { if (ret)
kfree(priv); goto camera_failed;
return ret;
}
} }
priv->handle = adevice->handle; priv->handle = adevice->handle;
dev_set_drvdata(&adevice->dev, priv); dev_set_drvdata(&adevice->dev, priv);
ideapad_priv = priv;
for (i = IDEAPAD_DEV_WLAN; i <= IDEAPAD_DEV_KILLSW; i++) { for (i = IDEAPAD_DEV_WLAN; i <= IDEAPAD_DEV_KILLSW; i++) {
if (!devs_present[i]) if (!devs_present[i])
continue; continue;
...@@ -325,6 +358,12 @@ static int ideapad_acpi_add(struct acpi_device *adevice) ...@@ -325,6 +358,12 @@ static int ideapad_acpi_add(struct acpi_device *adevice)
} }
ideapad_sync_rfk_state(adevice); ideapad_sync_rfk_state(adevice);
return 0; return 0;
camera_failed:
ideapad_platform_exit();
platform_failed:
kfree(priv);
return ret;
} }
static int ideapad_acpi_remove(struct acpi_device *adevice, int type) static int ideapad_acpi_remove(struct acpi_device *adevice, int type)
...@@ -337,6 +376,7 @@ static int ideapad_acpi_remove(struct acpi_device *adevice, int type) ...@@ -337,6 +376,7 @@ static int 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_platform_exit();
dev_set_drvdata(&adevice->dev, NULL); dev_set_drvdata(&adevice->dev, NULL);
kfree(priv); kfree(priv);
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册