diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 02:56:01 -0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 02:56:01 -0400 |
commit | 568c59e722da22c9b0a485c2f1aaf28cb1b36b79 (patch) | |
tree | 295bdb15737e938992a9cd01450be516276b0ccd /sound/pci/oxygen/oxygen.h | |
parent | 9bd6a73aef955216816fd6e28f371a868ed073d5 (diff) |
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: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
-rw-r--r-- | sound/pci/oxygen/oxygen.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 5f3fbf802222..914b8f406b14 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h | |||
@@ -58,6 +58,7 @@ struct oxygen_model { | |||
58 | const char *longname; | 58 | const char *longname; |
59 | const char *chip; | 59 | const char *chip; |
60 | struct module *owner; | 60 | struct module *owner; |
61 | int (*probe)(struct oxygen *chip, unsigned long driver_data); | ||
61 | void (*init)(struct oxygen *chip); | 62 | void (*init)(struct oxygen *chip); |
62 | int (*control_filter)(struct snd_kcontrol_new *template); | 63 | int (*control_filter)(struct snd_kcontrol_new *template); |
63 | int (*mixer_init)(struct oxygen *chip); | 64 | int (*mixer_init)(struct oxygen *chip); |
@@ -125,7 +126,8 @@ struct oxygen { | |||
125 | /* oxygen_lib.c */ | 126 | /* oxygen_lib.c */ |
126 | 127 | ||
127 | int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | 128 | int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, |
128 | const struct oxygen_model *model); | 129 | const struct oxygen_model *model, |
130 | unsigned long driver_data); | ||
129 | void oxygen_pci_remove(struct pci_dev *pci); | 131 | void oxygen_pci_remove(struct pci_dev *pci); |
130 | #ifdef CONFIG_PM | 132 | #ifdef CONFIG_PM |
131 | int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state); | 133 | int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state); |