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

Commit 568c59e7 authored by Clemens Ladisch's avatar Clemens Ladisch
Browse files

ALSA: oxygen: add probe callback 



Add a probe callback to the model structure so that model-specific
drivers can refine their model detection before the card is initialized.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent 9bd6a73a

sound/pci/oxygen/hifier.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int __devinit hifier_probe(struct pci_dev *pci, 
		++dev;

		return -ENOENT;

	}

	err = oxygen_pci_probe(pci, index[dev], id[dev], &model_hifier);

	err = oxygen_pci_probe(pci, index[dev], id[dev], &model_hifier, 0);

	if (err >= 0)

		++dev;

	return err;

sound/pci/oxygen/oxygen.c

+2 −1
Original line number Diff line number Diff line
@@ -354,7 +354,8 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, 
	}

	is_meridian = pci_id->driver_data;

	err = oxygen_pci_probe(pci, index[dev], id[dev],

			       is_meridian ? &model_meridian : &model_generic);

			       is_meridian ? &model_meridian : &model_generic,

			       0);

	if (err >= 0)

		++dev;

	return err;

sound/pci/oxygen/oxygen.h

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct oxygen_model { 
	const char *longname;

	const char *chip;

	struct module *owner;

	int (*probe)(struct oxygen *chip, unsigned long driver_data);

	void (*init)(struct oxygen *chip);

	int (*control_filter)(struct snd_kcontrol_new *template);

	int (*mixer_init)(struct oxygen *chip);
@@ -125,7 +126,8 @@ struct oxygen { 
/* oxygen_lib.c */



int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,

		     const struct oxygen_model *model);

		     const struct oxygen_model *model,

		     unsigned long driver_data);

void oxygen_pci_remove(struct pci_dev *pci);

#ifdef CONFIG_PM

int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state);

sound/pci/oxygen/oxygen_lib.c

+7 −1
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ static void oxygen_card_free(struct snd_card *card) 
}



int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,

		     const struct oxygen_model *model)

		     const struct oxygen_model *model,

		     unsigned long driver_data)

{

	struct snd_card *card;

	struct oxygen *chip;
@@ -470,6 +471,11 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, 
	snd_card_set_dev(card, &pci->dev);

	card->private_free = oxygen_card_free;



	if (chip->model.probe) {

		err = chip->model.probe(chip, driver_data);

		if (err < 0)

			goto err_card;

	}

	oxygen_init(chip);

	chip->model.init(chip);

sound/pci/oxygen/virtuoso.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static int __devinit xonar_probe(struct pci_dev *pci, 
		return -ENOENT;

	}

	err = oxygen_pci_probe(pci, index[dev], id[dev],

			       &xonar_models[pci_id->driver_data]);

			       &xonar_models[pci_id->driver_data], 0);

	if (err >= 0)

		++dev;

	return err;