diff options
Diffstat (limited to 'sound/aoa/fabrics/snd-aoa-fabric-layout.c')
-rw-r--r-- | sound/aoa/fabrics/snd-aoa-fabric-layout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c index 7e3880901c61..98806283d1b2 100644 --- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c +++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c | |||
@@ -732,7 +732,7 @@ static int check_codec(struct aoa_codec *codec, | |||
732 | if (codec->node && (strcmp(codec->node->name, "codec") == 0)) { | 732 | if (codec->node && (strcmp(codec->node->name, "codec") == 0)) { |
733 | snprintf(propname, sizeof(propname), | 733 | snprintf(propname, sizeof(propname), |
734 | "platform-%s-codec-ref", codec->name); | 734 | "platform-%s-codec-ref", codec->name); |
735 | ref = get_property(ldev->sound, propname, NULL); | 735 | ref = of_get_property(ldev->sound, propname, NULL); |
736 | if (!ref) { | 736 | if (!ref) { |
737 | printk(KERN_INFO "snd-aoa-fabric-layout: " | 737 | printk(KERN_INFO "snd-aoa-fabric-layout: " |
738 | "required property %s not present\n", propname); | 738 | "required property %s not present\n", propname); |
@@ -946,7 +946,7 @@ static struct aoa_fabric layout_fabric = { | |||
946 | static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) | 946 | static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) |
947 | { | 947 | { |
948 | struct device_node *sound = NULL; | 948 | struct device_node *sound = NULL; |
949 | unsigned int *layout_id; | 949 | const unsigned int *layout_id; |
950 | struct layout *layout; | 950 | struct layout *layout; |
951 | struct layout_dev *ldev = NULL; | 951 | struct layout_dev *ldev = NULL; |
952 | int err; | 952 | int err; |
@@ -962,7 +962,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) | |||
962 | } | 962 | } |
963 | if (!sound) return -ENODEV; | 963 | if (!sound) return -ENODEV; |
964 | 964 | ||
965 | layout_id = (unsigned int *) get_property(sound, "layout-id", NULL); | 965 | layout_id = of_get_property(sound, "layout-id", NULL); |
966 | if (!layout_id) | 966 | if (!layout_id) |
967 | goto outnodev; | 967 | goto outnodev; |
968 | printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n", | 968 | printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n", |