From c977efedc0ed4f1c3568dc1e97bc6f27b9a20b42 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 21 Dec 2012 13:15:52 -0800 Subject: [PATCH] --- yaml --- r: 348185 b: refs/heads/master c: 4eab7a9eb2def0b4b0f36397a6cfca6eadba7302 h: refs/heads/master i: 348183: 6279fca2fe6e25800a3e3cdbdb2aea7ec2bb5efa v: v3 --- [refs] | 2 +- trunk/drivers/thermal/exynos_thermal.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 458ff818e83f..baf5b7be81d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59a609a97a59a10b0d5e46e9491c856efb57065d +refs/heads/master: 4eab7a9eb2def0b4b0f36397a6cfca6eadba7302 diff --git a/trunk/drivers/thermal/exynos_thermal.c b/trunk/drivers/thermal/exynos_thermal.c index 7772d1603769..224751e9f5ff 100644 --- a/trunk/drivers/thermal/exynos_thermal.c +++ b/trunk/drivers/thermal/exynos_thermal.c @@ -832,7 +832,7 @@ static inline struct exynos_tmu_platform_data *exynos_get_driver_data( return (struct exynos_tmu_platform_data *) platform_get_device_id(pdev)->driver_data; } -static int __devinit exynos_tmu_probe(struct platform_device *pdev) +static int exynos_tmu_probe(struct platform_device *pdev) { struct exynos_tmu_data *data; struct exynos_tmu_platform_data *pdata = pdev->dev.platform_data; @@ -937,7 +937,7 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) return ret; } -static int __devexit exynos_tmu_remove(struct platform_device *pdev) +static int exynos_tmu_remove(struct platform_device *pdev) { struct exynos_tmu_data *data = platform_get_drvdata(pdev); @@ -985,7 +985,7 @@ static struct platform_driver exynos_tmu_driver = { .of_match_table = exynos_tmu_match, }, .probe = exynos_tmu_probe, - .remove = __devexit_p(exynos_tmu_remove), + .remove = exynos_tmu_remove, .id_table = exynos_tmu_driver_ids, };