patch-2.4.0-test9 linux/drivers/sound/es1371.c

Next file: linux/drivers/sound/esssolo1.c
Previous file: linux/drivers/sound/es1370.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/sound/es1371.c linux/drivers/sound/es1371.c
@@ -2859,7 +2859,7 @@
 	/* turn on S/PDIF output driver if requested */
 	outl(cssr, s->io+ES1371_REG_STATUS);
 	/* store it in the driver field */
-	pcidev->driver_data = s;
+	pci_set_drvdata(pcidev, s);
 	pcidev->dma_mask = 0xffffffff;
 	/* put it into driver list */
 	list_add_tail(&s->devs, &devs);
@@ -2886,7 +2886,7 @@
 
 static void __devinit es1371_remove(struct pci_dev *dev)
 {
-	struct es1371_state *s = (struct es1371_state *)dev->driver_data;
+	struct es1371_state *s = pci_get_drvdata(dev);
 
 	if (!s)
 		return;
@@ -2905,7 +2905,7 @@
 	unregister_sound_dsp(s->dev_dac);
 	unregister_sound_midi(s->dev_midi);
 	kfree(s);
-	dev->driver_data = NULL;
+	pci_set_drvdata(dev, NULL);
 }
 
 static struct pci_device_id id_table[] __devinitdata = {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)