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

Commit b2a0bafa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Use shutdown driver ops instead of reboot notifier 



The driver shutdown ops is simpler than registering reboot notifier
manually.  There should be no functional change by this -- the codec
driver calls its own callback while the bus driver just calls
azx_stop() like before.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d56db741

sound/pci/hda/hda_bind.c

+10 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/export.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <sound/core.h>

#include "hda_codec.h"

#include "hda_local.h"
@@ -142,6 +143,14 @@ static int hda_codec_driver_remove(struct device *dev) 
	return 0;

}



static void hda_codec_driver_shutdown(struct device *dev)

{

	struct hda_codec *codec = dev_to_hda_codec(dev);



	if (!pm_runtime_suspended(dev) && codec->patch_ops.reboot_notify)

		codec->patch_ops.reboot_notify(codec);

}



int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name,

			       struct module *owner)

{
@@ -150,6 +159,7 @@ int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name, 
	drv->driver.bus = &snd_hda_bus_type;

	drv->driver.probe = hda_codec_driver_probe;

	drv->driver.remove = hda_codec_driver_remove;

	drv->driver.shutdown = hda_codec_driver_shutdown;

	drv->driver.pm = &hda_codec_driver_pm;

	return driver_register(&drv->driver);

}

sound/pci/hda/hda_codec.c

+0 −18
Original line number Diff line number Diff line
@@ -4941,24 +4941,6 @@ static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid) 
	}

}



/**

 * snd_hda_bus_reboot_notify - call the reboot notifier of each codec

 * @bus: HD-audio bus

 */

void snd_hda_bus_reboot_notify(struct hda_bus *bus)

{

	struct hda_codec *codec;



	if (!bus)

		return;

	list_for_each_entry(codec, &bus->codec_list, list) {

		if (hda_codec_is_power_on(codec) &&

		    codec->patch_ops.reboot_notify)

			codec->patch_ops.reboot_notify(codec);

	}

}

EXPORT_SYMBOL_GPL(snd_hda_bus_reboot_notify);



/**

 * snd_hda_multi_out_dig_open - open the digital out in the exclusive mode

 * @codec: the HDA codec

sound/pci/hda/hda_codec.h

+0 −1
Original line number Diff line number Diff line
@@ -563,7 +563,6 @@ extern const struct snd_pcm_chmap_elem snd_pcm_2_1_chmaps[]; 
 * Misc

 */

void snd_hda_get_codec_name(struct hda_codec *codec, char *name, int namelen);

void snd_hda_bus_reboot_notify(struct hda_bus *bus);

void snd_hda_codec_set_power_to_all(struct hda_codec *codec, hda_nid_t fg,

				    unsigned int power_state);

sound/pci/hda/hda_controller.c

+0 −26
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/slab.h>

#include <linux/reboot.h>

#include <sound/core.h>

#include <sound/initval.h>

#include "hda_controller.h"
@@ -1972,30 +1971,5 @@ int azx_init_stream(struct azx *chip) 
}

EXPORT_SYMBOL_GPL(azx_init_stream);



/*

 * reboot notifier for hang-up problem at power-down

 */

static int azx_halt(struct notifier_block *nb, unsigned long event, void *buf)

{

	struct azx *chip = container_of(nb, struct azx, reboot_notifier);

	snd_hda_bus_reboot_notify(chip->bus);

	azx_stop_chip(chip);

	return NOTIFY_OK;

}



void azx_notifier_register(struct azx *chip)

{

	chip->reboot_notifier.notifier_call = azx_halt;

	register_reboot_notifier(&chip->reboot_notifier);

}

EXPORT_SYMBOL_GPL(azx_notifier_register);



void azx_notifier_unregister(struct azx *chip)

{

	if (chip->reboot_notifier.notifier_call)

		unregister_reboot_notifier(&chip->reboot_notifier);

}

EXPORT_SYMBOL_GPL(azx_notifier_unregister);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Common HDA driver functions");

sound/pci/hda/hda_controller.h

+0 −6
Original line number Diff line number Diff line
@@ -362,9 +362,6 @@ struct azx { 
	/* for debugging */

	unsigned int last_cmd[AZX_MAX_CODECS];



	/* reboot notifier (for mysterious hangup problem at power-down) */

	struct notifier_block reboot_notifier;



#ifdef CONFIG_SND_HDA_DSP_LOADER

	struct azx_dev saved_azx_dev;

#endif
@@ -437,7 +434,4 @@ int azx_probe_codecs(struct azx *chip, unsigned int max_slots); 
int azx_codec_configure(struct azx *chip);

int azx_init_stream(struct azx *chip);



void azx_notifier_register(struct azx *chip);

void azx_notifier_unregister(struct azx *chip);



#endif /* __SOUND_HDA_CONTROLLER_H */