aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/mpu401/mpu401.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/drivers/mpu401/mpu401.c')
-rw-r--r--sound/drivers/mpu401/mpu401.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 54e2ff9b5ca1..b1242ee937d9 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -56,12 +56,12 @@ MODULE_PARM_DESC(port, "Port # for MPU-401 device.");
56module_param_array(irq, int, NULL, 0444); 56module_param_array(irq, int, NULL, 0444);
57MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device."); 57MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
58 58
59static snd_card_t *snd_mpu401_legacy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 59static struct snd_card *snd_mpu401_legacy_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
60static int pnp_registered = 0; 60static int pnp_registered = 0;
61 61
62static int snd_mpu401_create(int dev, snd_card_t **rcard) 62static int snd_mpu401_create(int dev, struct snd_card **rcard)
63{ 63{
64 snd_card_t *card; 64 struct snd_card *card;
65 int err; 65 int err;
66 66
67 *rcard = NULL; 67 *rcard = NULL;
@@ -152,7 +152,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
152 const struct pnp_device_id *id) 152 const struct pnp_device_id *id)
153{ 153{
154 static int dev; 154 static int dev;
155 snd_card_t *card; 155 struct snd_card *card;
156 int err; 156 int err;
157 157
158 for ( ; dev < SNDRV_CARDS; ++dev) { 158 for ( ; dev < SNDRV_CARDS; ++dev) {
@@ -174,7 +174,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
174 174
175static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev) 175static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)
176{ 176{
177 snd_card_t *card = (snd_card_t *) pnp_get_drvdata(dev); 177 struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
178 178
179 snd_card_disconnect(card); 179 snd_card_disconnect(card);
180 snd_card_free_in_thread(card); 180 snd_card_free_in_thread(card);