projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
ultra45_env.c
diff --git
a/drivers/hwmon/ultra45_env.c
b/drivers/hwmon/ultra45_env.c
index 89747b8ac818691adbf51f4ae1c97a692b0ae465..fb3e69341c1bd72f82280c3904b891490a183132 100644
(file)
--- a/
drivers/hwmon/ultra45_env.c
+++ b/
drivers/hwmon/ultra45_env.c
@@
-250,7
+250,7
@@
static const struct attribute_group env_group = {
.attrs = env_attributes,
};
.attrs = env_attributes,
};
-static int
__devinit
env_probe(struct platform_device *op)
+static int env_probe(struct platform_device *op)
{
struct env *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM;
{
struct env *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM;
@@
-291,7
+291,7
@@
out_free:
goto out;
}
goto out;
}
-static int
__devexit
env_remove(struct platform_device *op)
+static int env_remove(struct platform_device *op)
{
struct env *p = platform_get_drvdata(op);
{
struct env *p = platform_get_drvdata(op);