ALSA: hda - Decouple PCM and hwdep devices from codec object

tiwai · tiwai · commit 327ef4f02582 · 2015-02-23T09:16:06.000+01:00
This is a preliminary patch for the hda_bus implementation, removing
the parent device setup to codec device.  Since the bus and the class
devices can't be crossed over, leave the sound devices to the default
parent device as is.

Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
@@ -168,7 +168,6 @@ static int snd_hda_do_attach(struct hda_beep *beep)
 	input_dev->evbit[0] = BIT_MASK(EV_SND);
 	input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
 	input_dev->event = snd_hda_beep_event;
-	input_dev->dev.parent = &codec->dev;
 	input_set_drvdata(input_dev, beep);
 
 	beep->dev = input_dev;
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
@@ -958,9 +958,6 @@ static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
 					      chip->card->dev,
 					      size, MAX_PREALLOC_SIZE);
-	/* link to codec */
-	for (s = 0; s < 2; s++)
-		pcm->streams[s].dev.parent = &codec->dev;
 	return 0;
 }
 
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
@@ -116,9 +116,6 @@ int snd_hda_create_hwdep(struct hda_codec *codec)
 	hwdep->ops.ioctl_compat = hda_hwdep_ioctl_compat;
 #endif
 
-	/* link to codec */
-	hwdep->dev.parent = &codec->dev;
-
 	/* for sysfs */
 	hwdep->dev.groups = snd_hda_dev_attr_groups;
 	dev_set_drvdata(&hwdep->dev, codec);

Original file line number	Diff line number	Diff line change
`@@ -958,9 +958,6 @@ static int azx_attach_pcm_stream(struct hda_bus bus, struct hda_codec codec,`
`958`	`958`	`snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,`
`959`	`959`	`chip->card->dev,`
`960`	`960`	`size, MAX_PREALLOC_SIZE);`
`961`		`- /* link to codec */`
`962`		`- for (s = 0; s < 2; s++)`
`963`		`- pcm->streams[s].dev.parent = &codec->dev;`
`964`	`961`	`return 0;`
`965`	`962`	`}`
`966`	`963`