1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From 376d63e9b981118f83646a836ce6626e541de1a3 Mon Sep 17 00:00:00 2001
From: Loren HUANG <b02279@freescale.com>
Date: Fri, 31 May 2013 18:29:58 +0800
Subject: [PATCH 6/6] ENGR00265130 gpu:Correct section mismatch in gpu kernel
driver
-Remove the __devinit for suspend/resume function.
-Replace __devinit to __devexit for remove function.
Upstream-Status: Backport [3.5.7-1.0.0]
Signed-off-by: Loren HUANG <b02279@freescale.com>
Acked-by: Lily Zhang
---
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
index 3632a6c..9d9dc57 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
@@ -1111,7 +1111,7 @@ static int __devinit gpu_probe(struct platform_device *pdev)
return ret;
}
-static int __devinit gpu_remove(struct platform_device *pdev)
+static int __devexit gpu_remove(struct platform_device *pdev)
{
gcmkHEADER();
#if gcdENABLE_FSCALE_VAL_ADJUST
@@ -1123,7 +1123,7 @@ static int __devinit gpu_remove(struct platform_device *pdev)
return 0;
}
-static int __devinit gpu_suspend(struct platform_device *dev, pm_message_t state)
+static int gpu_suspend(struct platform_device *dev, pm_message_t state)
{
gceSTATUS status;
gckGALDEVICE device;
@@ -1173,7 +1173,7 @@ static int __devinit gpu_suspend(struct platform_device *dev, pm_message_t state
return 0;
}
-static int __devinit gpu_resume(struct platform_device *dev)
+static int gpu_resume(struct platform_device *dev)
{
gceSTATUS status;
gckGALDEVICE device;
@@ -1284,7 +1284,7 @@ static const struct dev_pm_ops gpu_pm_ops = {
static struct platform_driver gpu_driver = {
.probe = gpu_probe,
- .remove = gpu_remove,
+ .remove = __devexit_p(gpu_remove),
.suspend = gpu_suspend,
.resume = gpu_resume,
--
1.8.3.2
|