diff options
Diffstat (limited to 'sound/aoa/core')
-rw-r--r-- | sound/aoa/core/snd-aoa-gpio-feature.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c index d34e5db6478..805dcbff225 100644 --- a/sound/aoa/core/snd-aoa-gpio-feature.c +++ b/sound/aoa/core/snd-aoa-gpio-feature.c | |||
@@ -71,7 +71,7 @@ static struct device_node *get_gpio(char *name, | |||
71 | if (!gpio) | 71 | if (!gpio) |
72 | return NULL; | 72 | return NULL; |
73 | while ((np = of_get_next_child(gpio, np))) { | 73 | while ((np = of_get_next_child(gpio, np))) { |
74 | audio_gpio = get_property(np, "audio-gpio", NULL); | 74 | audio_gpio = of_get_property(np, "audio-gpio", NULL); |
75 | if (!audio_gpio) | 75 | if (!audio_gpio) |
76 | continue; | 76 | continue; |
77 | if (strcmp(audio_gpio, name) == 0) | 77 | if (strcmp(audio_gpio, name) == 0) |
@@ -84,7 +84,7 @@ static struct device_node *get_gpio(char *name, | |||
84 | return NULL; | 84 | return NULL; |
85 | } | 85 | } |
86 | 86 | ||
87 | reg = get_property(np, "reg", NULL); | 87 | reg = of_get_property(np, "reg", NULL); |
88 | if (!reg) | 88 | if (!reg) |
89 | return NULL; | 89 | return NULL; |
90 | 90 | ||
@@ -96,7 +96,7 @@ static struct device_node *get_gpio(char *name, | |||
96 | if (*gpioptr < 0x50) | 96 | if (*gpioptr < 0x50) |
97 | *gpioptr += 0x50; | 97 | *gpioptr += 0x50; |
98 | 98 | ||
99 | reg = get_property(np, "audio-gpio-active-state", NULL); | 99 | reg = of_get_property(np, "audio-gpio-active-state", NULL); |
100 | if (!reg) | 100 | if (!reg) |
101 | /* Apple seems to default to 1, but | 101 | /* Apple seems to default to 1, but |
102 | * that doesn't seem right at least on most | 102 | * that doesn't seem right at least on most |