git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/soundcore' into for-linus
[pandora-kernel.git]
/
drivers
/
macintosh
/
windfarm_smu_sensors.c
diff --git
a/drivers/macintosh/windfarm_smu_sensors.c
b/drivers/macintosh/windfarm_smu_sensors.c
index
defe992
..
9c567b9
100644
(file)
--- a/
drivers/macintosh/windfarm_smu_sensors.c
+++ b/
drivers/macintosh/windfarm_smu_sensors.c
@@
-67,7
+67,7
@@
static void smu_ads_release(struct wf_sensor *sr)
static int smu_read_adc(u8 id, s32 *value)
{
struct smu_simple_cmd cmd;
static int smu_read_adc(u8 id, s32 *value)
{
struct smu_simple_cmd cmd;
- DECLARE_COMPLETION(comp);
+ DECLARE_COMPLETION
_ONSTACK
(comp);
int rc;
rc = smu_queue_simple(&cmd, SMU_CMD_READ_ADC, 1,
int rc;
rc = smu_queue_simple(&cmd, SMU_CMD_READ_ADC, 1,
@@
-204,8
+204,8
@@
static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
if (ads == NULL)
return NULL;
ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
if (ads == NULL)
return NULL;
- c = get_property(node, "device_type", NULL);
- l = get_property(node, "location", NULL);
+ c =
of_
get_property(node, "device_type", NULL);
+ l =
of_
get_property(node, "location", NULL);
if (c == NULL || l == NULL)
goto fail;
if (c == NULL || l == NULL)
goto fail;
@@
-255,7
+255,7
@@
static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
} else
goto fail;
} else
goto fail;
- v = get_property(node, "reg", NULL);
+ v =
of_
get_property(node, "reg", NULL);
if (v == NULL)
goto fail;
ads->reg = *v;
if (v == NULL)
goto fail;
ads->reg = *v;