Commit 267bccaf authored by Ondrej Zary's avatar Ondrej Zary Committed by Takashi Iwai
Browse files

ALSA: ice1712: add chip_exit callback 



Add chip_exit callback to allow card subdrivers to do cleanup work on module
removal.

Needed by Philips PSC724 subdriver to cancel delayed work.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dcda5806

sound/pci/ice1712/ice1712.c

+7 −1
Original line number Diff line number Diff line
@@ -2686,6 +2686,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, 
	for (tbl = card_tables; *tbl; tbl++) {

		for (c = *tbl; c->subvendor; c++) {

			if (c->subvendor == ice->eeprom.subvendor) {

				ice->card_info = c;

				strcpy(card->shortname, c->name);

				if (c->driver) /* specific driver? */

					strcpy(card->driver, c->driver);
@@ -2799,7 +2800,12 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, 


static void __devexit snd_ice1712_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

	struct snd_card *card = pci_get_drvdata(pci);

	struct snd_ice1712 *ice = card->private_data;



	if (ice->card_info && ice->card_info->chip_exit)

		ice->card_info->chip_exit(ice);

	snd_card_free(card);

	pci_set_drvdata(pci, NULL);

}

sound/pci/ice1712/ice1712.h

+3 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ struct snd_ice1712_spdif { 
	} ops;

};



struct snd_ice1712_card_info;



struct snd_ice1712 {

	unsigned long conp_dma_size;
@@ -324,6 +325,7 @@ struct snd_ice1712 { 
	struct snd_info_entry *proc_entry;



	struct snd_ice1712_eeprom eeprom;

	struct snd_ice1712_card_info *card_info;



	unsigned int pro_volumes[20];

	unsigned int omni:1;		/* Delta Omni I/O */
@@ -517,6 +519,7 @@ struct snd_ice1712_card_info { 
	char *model;

	char *driver;

	int (*chip_init)(struct snd_ice1712 *);

	void (*chip_exit)(struct snd_ice1712 *);

	int (*build_controls)(struct snd_ice1712 *);

	unsigned int no_mpu401:1;

	unsigned int mpu401_1_info_flags;

sound/pci/ice1712/ice1724.c

+7 −1
Original line number Diff line number Diff line
@@ -2348,6 +2348,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice, 
				ice->eeprom.subvendor = c->subvendor;

			} else if (c->subvendor != ice->eeprom.subvendor)

				continue;

			ice->card_info = c;

			if (!c->eeprom_size || !c->eeprom_data)

				goto found;

			/* if the EEPROM is given by the driver, use it */
@@ -2788,7 +2789,12 @@ __found: 


static void __devexit snd_vt1724_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

	struct snd_card *card = pci_get_drvdata(pci);

	struct snd_ice1712 *ice = card->private_data;



	if (ice->card_info && ice->card_info->chip_exit)

		ice->card_info->chip_exit(ice);

	snd_card_free(card);

	pci_set_drvdata(pci, NULL);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE