Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: oxygen: add probe callback

Browse source 
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: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2008-09-22 08:56:01 +02:00
parent 9bd6a73aef
commit 568c59e722
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/pci/oxygen/hifier.c
View file

@ -180,7 +180,7 @@ static int __devinit hifier_probe(struct pci_dev *pci,
++dev; ++dev;
return -ENOENT; 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) if (err >= 0)
++dev; ++dev;
return err; return err;

3
sound/pci/oxygen/oxygen.c
View file

@ -354,7 +354,8 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
} }
is_meridian = pci_id->driver_data; is_meridian = pci_id->driver_data;
err = oxygen_pci_probe(pci, index[dev], id[dev], 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) if (err >= 0)
++dev; ++dev;
return err; return err;

4
sound/pci/oxygen/oxygen.h
View file

@ -58,6 +58,7 @@ struct oxygen_model {
const char *longname; const char *longname;
const char *chip; const char *chip;
struct module *owner; struct module *owner;
int (*probe)(struct oxygen *chip, unsigned long driver_data);
void (*init)(struct oxygen *chip); void (*init)(struct oxygen *chip);
int (*control_filter)(struct snd_kcontrol_new *template); int (*control_filter)(struct snd_kcontrol_new *template);
int (*mixer_init)(struct oxygen *chip); int (*mixer_init)(struct oxygen *chip);
@ -125,7 +126,8 @@ struct oxygen {
/* oxygen_lib.c */ /* oxygen_lib.c */
int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, 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); void oxygen_pci_remove(struct pci_dev *pci);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state); int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state);

8
sound/pci/oxygen/oxygen_lib.c
View file

@ -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, 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 snd_card *card;
struct oxygen *chip; 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); snd_card_set_dev(card, &pci->dev);
card->private_free = oxygen_card_free; 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); oxygen_init(chip);
chip->model.init(chip); chip->model.init(chip);

2
sound/pci/oxygen/virtuoso.c
View file

@ -696,7 +696,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
return -ENOENT; return -ENOENT;
} }
err = oxygen_pci_probe(pci, index[dev], id[dev], 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) if (err >= 0)
++dev; ++dev;
return err; return err;