Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f55b39 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Rename get_property to of_get_property: sound 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e2eb6392

sound/aoa/codecs/snd-aoa-codec-onyx.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter) 
		if (device_is_compatible(dev, "pcm3052")) {

			const u32 *addr;

			printk(KERN_DEBUG PFX "found pcm3052\n");

			addr = get_property(dev, "reg", NULL);

			addr = of_get_property(dev, "reg", NULL);

			if (!addr)

				return -ENODEV;

			return onyx_create(adapter, dev, (*addr)>>1);

sound/aoa/codecs/snd-aoa-codec-tas.c

+2 −2
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) 
		if (device_is_compatible(dev, "tas3004")) {

			const u32 *addr;

			printk(KERN_DEBUG PFX "found tas3004\n");

			addr = get_property(dev, "reg", NULL);

			addr = of_get_property(dev, "reg", NULL);

			if (!addr)

				continue;

			return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
@@ -953,7 +953,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) 
			const u32 *_addr;

			u32 addr;

			printk(KERN_DEBUG PFX "found 'deq' node\n");

			_addr = (u32 *) get_property(dev, "i2c-address", NULL);

			_addr = of_get_property(dev, "i2c-address", NULL);

			if (!_addr)

				continue;

			addr = ((*_addr) >> 1) & 0x7f;

sound/aoa/core/snd-aoa-gpio-feature.c

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static struct device_node *get_gpio(char *name, 
		if (!gpio)

			return NULL;

		while ((np = of_get_next_child(gpio, np))) {

			audio_gpio = get_property(np, "audio-gpio", NULL);

			audio_gpio = of_get_property(np, "audio-gpio", NULL);

			if (!audio_gpio)

				continue;

			if (strcmp(audio_gpio, name) == 0)
@@ -84,7 +84,7 @@ static struct device_node *get_gpio(char *name, 
			return NULL;

	}



	reg = get_property(np, "reg", NULL);

	reg = of_get_property(np, "reg", NULL);

	if (!reg)

		return NULL;
@@ -96,7 +96,7 @@ static struct device_node *get_gpio(char *name, 
	if (*gpioptr < 0x50)

		*gpioptr += 0x50;



	reg = get_property(np, "audio-gpio-active-state", NULL);

	reg = of_get_property(np, "audio-gpio-active-state", NULL);

	if (!reg)

		/* Apple seems to default to 1, but

		 * that doesn't seem right at least on most

sound/aoa/fabrics/snd-aoa-fabric-layout.c

+3 −3
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int check_codec(struct aoa_codec *codec, 
	if (codec->node && (strcmp(codec->node->name, "codec") == 0)) {

		snprintf(propname, sizeof(propname),

			 "platform-%s-codec-ref", codec->name);

		ref = get_property(ldev->sound, propname, NULL);

		ref = of_get_property(ldev->sound, propname, NULL);

		if (!ref) {

			printk(KERN_INFO "snd-aoa-fabric-layout: "

				"required property %s not present\n", propname);
@@ -946,7 +946,7 @@ static struct aoa_fabric layout_fabric = { 
static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)

{

	struct device_node *sound = NULL;

	unsigned int *layout_id;

	const unsigned int *layout_id;

	struct layout *layout;

	struct layout_dev *ldev = NULL;

	int err;
@@ -962,7 +962,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) 
	}

	if (!sound) return -ENODEV;



	layout_id = (unsigned int *) get_property(sound, "layout-id", NULL);

	layout_id = of_get_property(sound, "layout-id", NULL);

	if (!layout_id)

		goto outnodev;

	printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",

sound/aoa/soundbus/core.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp, 
	 * it's not really legal to split it out with commas. We split it

	 * up using a number of environment variables instead. */



	compat = get_property(of->node, "compatible", &cplen);

	compat = of_get_property(of->node, "compatible", &cplen);

	while (compat && cplen > 0) {

		envp[i++] = scratch;

		length = scnprintf (scratch, buffer_size,