[PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[John Kim]

Following patch is to make ESS968 driver to work with PNP API.

John Kim


diff -Nau linux-2.5.65/sound/isa/sb/es968.c linux-2.5.65-new/sound/isa/sb/es968.c
--- linux-2.5.65/sound/isa/sb/es968.c	2003-03-17 16:44:06.000000000 -0500
+++ linux-2.5.65-new/sound/isa/sb/es968.c	2003-03-19 06:45:47.000000000 -0500
@@ -23,11 +23,7 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/time.h>
-#ifndef LINUX_ISAPNP_H
-#include <linux/isapnp.h>
-#define isapnp_card pci_bus
-#define isapnp_dev pci_dev
-#endif
+#include <linux/pnp.h>
 #include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -35,6 +31,8 @@
 
 #define chip_t sb_t
 
+#define PFX "es968: "
+
 MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("ESS AudioDrive ES968");
 MODULE_LICENSE("GPL");
@@ -68,32 +66,18 @@
 MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
 
 struct snd_card_es968 {
-#ifdef __ISAPNP__
-	struct isapnp_dev *dev;
-#endif	/* __ISAPNP__ */
+	struct pnp_dev *dev;
 };
 
-static snd_card_t *snd_es968_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-
-#ifdef __ISAPNP__
-static struct isapnp_card *snd_es968_isapnp_cards[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_PTR;
-static const struct isapnp_card_id *snd_es968_isapnp_id[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_PTR;
-
-static struct isapnp_card_id snd_es968_pnpids[] __devinitdata = {
-        {
-                ISAPNP_CARD_ID('E','S','S',0x0968),
-                .devs = { ISAPNP_DEVICE_ID('E','S','S',0x0968), }
-        },
-        { ISAPNP_CARD_END, }
+static struct pnp_card_id snd_es968_pnpids[] __devinitdata = {
+	{ .id = "ESS0968", .devs = { { "@@@0968" }, } },
+	{ .id = "", } /* end */
 };
 
-ISAPNP_CARD_TABLE(snd_es968_pnpids);
-
-#endif	/* __ISAPNP__ */
+MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
 
 #define	DRIVER_NAME	"snd-card-es968"
 
-
 static void snd_card_es968_interrupt(int irq, void *dev_id,
 				     struct pt_regs *regs)
 {
@@ -106,64 +90,50 @@
 	}
 }
 
-#ifdef __ISAPNP__
-static int __init snd_card_es968_isapnp(int dev, struct snd_card_es968 *acard)
-{
-	const struct isapnp_card_id *id = snd_es968_isapnp_id[dev];
-	struct isapnp_card *card = snd_es968_isapnp_cards[dev];
-	struct isapnp_dev *pdev;
-
-	acard->dev = isapnp_find_dev(card, id->devs[0].vendor, id->devs[0].function, NULL);
-	if (acard->dev->active) {
-		acard->dev = NULL;
-		return -EBUSY;
+static int __devinit snd_card_es968_isapnp(int dev, struct snd_card_es968 *acard,
+					struct pnp_card_link *card,
+					const struct pnp_card_id *id)
+{
+	struct pnp_dev *pdev;
+	struct pnp_resource_table * cfg = kmalloc(GFP_ATOMIC, sizeof(struct pnp_resource_table));
+	int err;
+	if (!cfg)
+		return -ENOMEM;
+	acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
+	if (acard->dev == NULL) {
+		kfree(cfg);
+		return -ENODEV;
 	}
 
 	pdev = acard->dev;
-	if (pdev->prepare(pdev)<0)
-		return -EAGAIN;
 
+	pnp_init_resource_table(cfg);
+
+	/* override resources */
 	if (port[dev] != SNDRV_AUTO_PORT)
-		isapnp_resource_change(&pdev->resource[0], port[dev], 16);
+		pnp_resource_change(&cfg->port_resource[0], port[dev], 16);
 	if (dma8[dev] != SNDRV_AUTO_DMA)
-		isapnp_resource_change(&pdev->dma_resource[0], dma8[dev],
-			1);
+		pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1);
 	if (irq[dev] != SNDRV_AUTO_IRQ)
-		isapnp_resource_change(&pdev->irq_resource[0], irq[dev], 1);
-
-	if (pdev->activate(pdev)<0) {
-		snd_printk("AUDIO isapnp configure failure\n");
-		return -EBUSY;
-	}
-
-	port[dev] = pdev->resource[0].start;
-	dma8[dev] = pdev->dma_resource[0].start;
-	irq[dev] = pdev->irq_resource[0].start;
+		pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
+	if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0)
+		printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n");
+	err = pnp_activate_dev(pdev);
+	if (err < 0) {
+		printk(KERN_ERR PFX "AUDIO pnp configure failure\n");
+		return err;
+	}
+	port[dev] = pnp_port_start(pdev, 0);
+	dma8[dev] = pnp_dma(pdev, 1);
+	irq[dev] = pnp_irq(pdev, 0);
 
+	kfree(cfg);
 	return 0;
 }
 
-static void snd_card_es968_deactivate(struct snd_card_es968 *acard)
-{
-	if (acard->dev) {
-		acard->dev->deactivate(acard->dev);
-		acard->dev = NULL;
-	}
-}
-#endif	/* __ISAPNP__ */
-
-static void snd_card_es968_free(snd_card_t *card)
-{
-	struct snd_card_es968 *acard = (struct snd_card_es968 *)card->private_data;
-
-	if (acard) {
-#ifdef __ISAPNP__
-		snd_card_es968_deactivate(acard);
-#endif	/* __ISAPNP__ */
-	}
-}
-
-static int __init snd_card_es968_probe(int dev)
+static int __init snd_card_es968_probe(int dev,
+					struct pnp_card_link *pcard,
+					const struct pnp_card_id *pid)
 {
 	int error;
 	sb_t *chip;
@@ -174,18 +144,10 @@
 				 sizeof(struct snd_card_es968))) == NULL)
 		return -ENOMEM;
 	acard = (struct snd_card_es968 *)card->private_data;
-	card->private_free = snd_card_es968_free;
-
-#ifdef __ISAPNP__
-	if ((error = snd_card_es968_isapnp(dev, acard))) {
+	if ((error = snd_card_es968_isapnp(dev, acard, pcard, pid))) {
 		snd_card_free(card);
 		return error;
 	}
-#else
-	snd_printk("you have to enable PnP support ...\n");
-	snd_card_free(card);
-	return -ENOSYS;
-#endif	/* __ISAPNP__ */
 
 	if ((error = snd_sbdsp_create(card, port[dev],
 				      irq[dev],
@@ -221,13 +183,12 @@
 		snd_card_free(card);
 		return error;
 	}
-	snd_es968_cards[dev] = card;
+	pnp_set_card_drvdata(pcard, card);
 	return 0;
 }
 
-#ifdef __ISAPNP__
-static int __init snd_es968_isapnp_detect(struct isapnp_card *card,
-                                          const struct isapnp_card_id *id)
+static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
+                                          const struct pnp_card_id *id)
 {
 	static int dev;
 	int res;
@@ -235,9 +196,7 @@
 	for ( ; dev < SNDRV_CARDS; dev++) {
 		if (!enable[dev])
 			continue;
-		snd_es968_isapnp_cards[dev] = card;
-		snd_es968_isapnp_id[dev] = id;
-		res = snd_card_es968_probe(dev);
+		res = snd_card_es968_probe(dev, card, id);
 		if (res < 0)
 			return res;
 		dev++;
@@ -245,30 +204,38 @@
         }
         return -ENODEV;
 }
-#endif /* __ISAPNP__ */
+
+static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard)
+{
+	snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard);
+
+	snd_card_disconnect(card);
+	snd_card_free_in_thread(card);
+}
+
+static struct pnp_card_driver es968_pnpc_driver = {
+	.flags		= PNP_DRIVER_RES_DISABLE,
+	.name		= "es968",
+	.id_table	= snd_es968_pnpids,
+	.probe		= snd_es968_pnp_detect,
+	.remove		= __devexit_p(snd_es968_pnp_remove),
+};
 
 static int __init alsa_card_es968_init(void)
 {
 	int cards = 0;
 
-#ifdef __ISAPNP__
-	cards += isapnp_probe_cards(snd_es968_pnpids, snd_es968_isapnp_detect);
-#else
-	snd_printk("you have to enable ISA PnP support.\n");
-#endif
+	cards += pnp_register_card_driver(&es968_pnpc_driver);
 #ifdef MODULE
 	if (!cards)
-		snd_printk("no ES968 based soundcards found\n");
+		printk(KERN_ERR "no ES968 based soundcards found\n");
 #endif
 	return cards ? 0 : -ENODEV;
 }
 
 static void __exit alsa_card_es968_exit(void)
 {
-	int dev;
-
-	for (dev = 0; dev < SNDRV_CARDS; dev++)
-		snd_card_free(snd_es968_cards[dev]);
+	pnp_unregister_card_driver(&es968_pnpc_driver);
 }
 
 module_init(alsa_card_es968_init)

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[Christoph Hellwig]

On Wed, Mar 19, 2003 at 07:03:57AM -0500, John Kim wrote:
>  struct snd_card_es968 {
> -#ifdef __ISAPNP__
> -	struct isapnp_dev *dev;
> -#endif	/* __ISAPNP__ */
> +	struct pnp_dev *dev;
>  };

What about completly removing struct snd_card_es968 and using pnp_dev
directtly instead?  sound/* is full of this overdesign and it's time
to get it follow kernel style a bit more..

>  static int __init alsa_card_es968_init(void)
>  {
>  	int cards = 0;
>  
> -#ifdef __ISAPNP__
> -	cards += isapnp_probe_cards(snd_es968_pnpids, snd_es968_isapnp_detect);
> -#else
> -	snd_printk("you have to enable ISA PnP support.\n");
> -#endif
> +	cards += pnp_register_card_driver(&es968_pnpc_driver);
>  #ifdef MODULE
>  	if (!cards)
> -		snd_printk("no ES968 based soundcards found\n");
> +		printk(KERN_ERR "no ES968 based soundcards found\n");
>  #endif
>  	return cards ? 0 : -ENODEV;
>  }

That printk is useless, you get a useful message from modprobe on
an ENODEV return anyway.

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[John Kim]

On Wed, 19 Mar 2003, Christoph Hellwig wrote:

> On Wed, Mar 19, 2003 at 07:03:57AM -0500, John Kim wrote:
> >  struct snd_card_es968 {
> > -#ifdef __ISAPNP__
> > -	struct isapnp_dev *dev;
> > -#endif	/* __ISAPNP__ */
> > +	struct pnp_dev *dev;
> >  };
> 
> What about completly removing struct snd_card_es968 and using pnp_dev
> directtly instead?  sound/* is full of this overdesign and it's time
> to get it follow kernel style a bit more..

Perhaps the task of code clean up should be done in separate track than 
pnp api conversion task?
 
> >  static int __init alsa_card_es968_init(void)
> >  {
> >  	int cards = 0;
> >  
> > -#ifdef __ISAPNP__
> > -	cards += isapnp_probe_cards(snd_es968_pnpids, snd_es968_isapnp_detect);
> > -#else
> > -	snd_printk("you have to enable ISA PnP support.\n");
> > -#endif
> > +	cards += pnp_register_card_driver(&es968_pnpc_driver);
> >  #ifdef MODULE
> >  	if (!cards)
> > -		snd_printk("no ES968 based soundcards found\n");
> > +		printk(KERN_ERR "no ES968 based soundcards found\n");
> >  #endif
> >  	return cards ? 0 : -ENODEV;
> >  }
> 
> That printk is useless, you get a useful message from modprobe on
> an ENODEV return anyway.

I'll make a new diff without useless printk line.  Thank you.

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c [rev2]

[John Kim]

This patch is just like the last one minus the bogus prink.

John Kim


diff -Nau linux-2.5.65/sound/isa/sb/es968.c linux-2.5.65-new/sound/isa/sb/es968.c
--- linux-2.5.65/sound/isa/sb/es968.c	2003-03-17 16:44:06.000000000 -0500
+++ linux-2.5.65-new/sound/isa/sb/es968.c	2003-03-19 09:24:52.000000000 -0500
@@ -23,11 +23,7 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/time.h>
-#ifndef LINUX_ISAPNP_H
-#include <linux/isapnp.h>
-#define isapnp_card pci_bus
-#define isapnp_dev pci_dev
-#endif
+#include <linux/pnp.h>
 #include <sound/core.h>
 #define SNDRV_GET_ID
 #include <sound/initval.h>
@@ -35,6 +31,8 @@
 
 #define chip_t sb_t
 
+#define PFX "es968: "
+
 MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
 MODULE_DESCRIPTION("ESS AudioDrive ES968");
 MODULE_LICENSE("GPL");
@@ -68,32 +66,18 @@
 MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
 
 struct snd_card_es968 {
-#ifdef __ISAPNP__
-	struct isapnp_dev *dev;
-#endif	/* __ISAPNP__ */
+	struct pnp_dev *dev;
 };
 
-static snd_card_t *snd_es968_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-
-#ifdef __ISAPNP__
-static struct isapnp_card *snd_es968_isapnp_cards[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_PTR;
-static const struct isapnp_card_id *snd_es968_isapnp_id[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_PTR;
-
-static struct isapnp_card_id snd_es968_pnpids[] __devinitdata = {
-        {
-                ISAPNP_CARD_ID('E','S','S',0x0968),
-                .devs = { ISAPNP_DEVICE_ID('E','S','S',0x0968), }
-        },
-        { ISAPNP_CARD_END, }
+static struct pnp_card_id snd_es968_pnpids[] __devinitdata = {
+	{ .id = "ESS0968", .devs = { { "@@@0968" }, } },
+	{ .id = "", } /* end */
 };
 
-ISAPNP_CARD_TABLE(snd_es968_pnpids);
-
-#endif	/* __ISAPNP__ */
+MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
 
 #define	DRIVER_NAME	"snd-card-es968"
 
-
 static void snd_card_es968_interrupt(int irq, void *dev_id,
 				     struct pt_regs *regs)
 {
@@ -106,64 +90,50 @@
 	}
 }
 
-#ifdef __ISAPNP__
-static int __init snd_card_es968_isapnp(int dev, struct snd_card_es968 *acard)
-{
-	const struct isapnp_card_id *id = snd_es968_isapnp_id[dev];
-	struct isapnp_card *card = snd_es968_isapnp_cards[dev];
-	struct isapnp_dev *pdev;
-
-	acard->dev = isapnp_find_dev(card, id->devs[0].vendor, id->devs[0].function, NULL);
-	if (acard->dev->active) {
-		acard->dev = NULL;
-		return -EBUSY;
+static int __devinit snd_card_es968_isapnp(int dev, struct snd_card_es968 *acard,
+					struct pnp_card_link *card,
+					const struct pnp_card_id *id)
+{
+	struct pnp_dev *pdev;
+	struct pnp_resource_table * cfg = kmalloc(GFP_ATOMIC, sizeof(struct pnp_resource_table));
+	int err;
+	if (!cfg)
+		return -ENOMEM;
+	acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
+	if (acard->dev == NULL) {
+		kfree(cfg);
+		return -ENODEV;
 	}
 
 	pdev = acard->dev;
-	if (pdev->prepare(pdev)<0)
-		return -EAGAIN;
 
+	pnp_init_resource_table(cfg);
+
+	/* override resources */
 	if (port[dev] != SNDRV_AUTO_PORT)
-		isapnp_resource_change(&pdev->resource[0], port[dev], 16);
+		pnp_resource_change(&cfg->port_resource[0], port[dev], 16);
 	if (dma8[dev] != SNDRV_AUTO_DMA)
-		isapnp_resource_change(&pdev->dma_resource[0], dma8[dev],
-			1);
+		pnp_resource_change(&cfg->dma_resource[0], dma8[dev], 1);
 	if (irq[dev] != SNDRV_AUTO_IRQ)
-		isapnp_resource_change(&pdev->irq_resource[0], irq[dev], 1);
-
-	if (pdev->activate(pdev)<0) {
-		snd_printk("AUDIO isapnp configure failure\n");
-		return -EBUSY;
-	}
-
-	port[dev] = pdev->resource[0].start;
-	dma8[dev] = pdev->dma_resource[0].start;
-	irq[dev] = pdev->irq_resource[0].start;
+		pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
+	if ((pnp_manual_config_dev(pdev, cfg, 0)) < 0)
+		printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n");
+	err = pnp_activate_dev(pdev);
+	if (err < 0) {
+		printk(KERN_ERR PFX "AUDIO pnp configure failure\n");
+		return err;
+	}
+	port[dev] = pnp_port_start(pdev, 0);
+	dma8[dev] = pnp_dma(pdev, 1);
+	irq[dev] = pnp_irq(pdev, 0);
 
+	kfree(cfg);
 	return 0;
 }
 
-static void snd_card_es968_deactivate(struct snd_card_es968 *acard)
-{
-	if (acard->dev) {
-		acard->dev->deactivate(acard->dev);
-		acard->dev = NULL;
-	}
-}
-#endif	/* __ISAPNP__ */
-
-static void snd_card_es968_free(snd_card_t *card)
-{
-	struct snd_card_es968 *acard = (struct snd_card_es968 *)card->private_data;
-
-	if (acard) {
-#ifdef __ISAPNP__
-		snd_card_es968_deactivate(acard);
-#endif	/* __ISAPNP__ */
-	}
-}
-
-static int __init snd_card_es968_probe(int dev)
+static int __init snd_card_es968_probe(int dev,
+					struct pnp_card_link *pcard,
+					const struct pnp_card_id *pid)
 {
 	int error;
 	sb_t *chip;
@@ -174,18 +144,10 @@
 				 sizeof(struct snd_card_es968))) == NULL)
 		return -ENOMEM;
 	acard = (struct snd_card_es968 *)card->private_data;
-	card->private_free = snd_card_es968_free;
-
-#ifdef __ISAPNP__
-	if ((error = snd_card_es968_isapnp(dev, acard))) {
+	if ((error = snd_card_es968_isapnp(dev, acard, pcard, pid))) {
 		snd_card_free(card);
 		return error;
 	}
-#else
-	snd_printk("you have to enable PnP support ...\n");
-	snd_card_free(card);
-	return -ENOSYS;
-#endif	/* __ISAPNP__ */
 
 	if ((error = snd_sbdsp_create(card, port[dev],
 				      irq[dev],
@@ -221,13 +183,12 @@
 		snd_card_free(card);
 		return error;
 	}
-	snd_es968_cards[dev] = card;
+	pnp_set_card_drvdata(pcard, card);
 	return 0;
 }
 
-#ifdef __ISAPNP__
-static int __init snd_es968_isapnp_detect(struct isapnp_card *card,
-                                          const struct isapnp_card_id *id)
+static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
+                                          const struct pnp_card_id *id)
 {
 	static int dev;
 	int res;
@@ -235,9 +196,7 @@
 	for ( ; dev < SNDRV_CARDS; dev++) {
 		if (!enable[dev])
 			continue;
-		snd_es968_isapnp_cards[dev] = card;
-		snd_es968_isapnp_id[dev] = id;
-		res = snd_card_es968_probe(dev);
+		res = snd_card_es968_probe(dev, card, id);
 		if (res < 0)
 			return res;
 		dev++;
@@ -245,30 +204,31 @@
         }
         return -ENODEV;
 }
-#endif /* __ISAPNP__ */
 
-static int __init alsa_card_es968_init(void)
+static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard)
 {
-	int cards = 0;
+	snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard);
 
-#ifdef __ISAPNP__
-	cards += isapnp_probe_cards(snd_es968_pnpids, snd_es968_isapnp_detect);
-#else
-	snd_printk("you have to enable ISA PnP support.\n");
-#endif
-#ifdef MODULE
-	if (!cards)
-		snd_printk("no ES968 based soundcards found\n");
-#endif
-	return cards ? 0 : -ENODEV;
+	snd_card_disconnect(card);
+	snd_card_free_in_thread(card);
 }
 
-static void __exit alsa_card_es968_exit(void)
+static struct pnp_card_driver es968_pnpc_driver = {
+	.flags		= PNP_DRIVER_RES_DISABLE,
+	.name		= "es968",
+	.id_table	= snd_es968_pnpids,
+	.probe		= snd_es968_pnp_detect,
+	.remove		= __devexit_p(snd_es968_pnp_remove),
+};
+
+static int __init alsa_card_es968_init(void)
 {
-	int dev;
+	return (pnp_register_card_driver(&es968_pnpc_driver) ? 0 : -ENODEV);
+}
 
-	for (dev = 0; dev < SNDRV_CARDS; dev++)
-		snd_card_free(snd_es968_cards[dev]);
+static void __exit alsa_card_es968_exit(void)
+{
+	pnp_unregister_card_driver(&es968_pnpc_driver);
 }
 
 module_init(alsa_card_es968_init)

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[Ruslan U. Zakirov]

JK> Following patch is to make ESS968 driver to work with PNP API.

JK> +               printk(KERN_ERR PFX "AUDIO the requested resources are invalid, using auto config\n");
JK> +       err = pnp_activate_dev(pdev);
JK> +       if (err < 0) {
JK> +               printk(KERN_ERR PFX "AUDIO pnp configure failure\n");
JK> +               return err;
JK> +       }
Hello, John and other.
You've forgot to kfree(cfg) in the error path.
       Best regards, Ruslan.

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[Ruslan U. Zakirov]

JK> Following patch is to make ESS968 driver to work with PNP API.
[SNIP]
JK> +static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
[SNIP]
      Hello, Adam, Greg and other.
As I think in this section of kernel it's not necessarily to use
__devinit and __devexit.
Soundcards(and other devices) can't be HotPlug as I know.
And if we look at #define of this attributes, then we see that
it useless with not HotPlug devices.

180 #ifdef CONFIG_HOTPLUG
181 #define __devinit
182 #define __devinitdata
183 #define __devexit
184 #define __devexitdata
185 #else
186 #define __devinit __init
187 #define __devinitdata __initdata
188 #define __devexit __exit
189 #define __devexitdata __exitdata
190 #endif
And with changes from __init to __devinit and enabled CONFIG_HOTPLUG
we loose advantage of __init.
May be I've missed something?
       Best regards, Ruslan.

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[John Kim]

Hmm..  I think you're right.  I don't know of a hotplug isa sound card. 
 I've essentially made the changes by looking at how sound/isa/als100.c 
was changed in 2.5.65.
http://linux.bkbits.net:8080/linux-2.5/cset@1.1075.1.7?nav=index.html|ChangeSet@-2w
Since that change was accepted, I just assumed it was right without much 
thought.  I guess I'll have to make a patch for als100 to use __devinit 
and __devexit.

John Kim


On Wed, 19 Mar 2003, Ruslan U. Zakirov wrote:

> JK> Following patch is to make ESS968 driver to work with PNP API.
> [SNIP]
> JK> +static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
> [SNIP]
>       Hello, Adam, Greg and other.
> As I think in this section of kernel it's not necessarily to use
> __devinit and __devexit.
> Soundcards(and other devices) can't be HotPlug as I know.
> And if we look at #define of this attributes, then we see that
> it useless with not HotPlug devices.
> 
> 180 #ifdef CONFIG_HOTPLUG
> 181 #define __devinit
> 182 #define __devinitdata
> 183 #define __devexit
> 184 #define __devexitdata
> 185 #else
> 186 #define __devinit __init
> 187 #define __devinitdata __initdata
> 188 #define __devexit __exit
> 189 #define __devexitdata __exitdata
> 190 #endif
> And with changes from __init to __devinit and enabled CONFIG_HOTPLUG
> we loose advantage of __init.
> May be I've missed something?
>        Best regards, Ruslan.
> 

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[Adam Belay]

On Wed, Mar 19, 2003 at 06:09:23PM +0300, Ruslan U. Zakirov wrote:
> JK> Following patch is to make ESS968 driver to work with PNP API.
> [SNIP]
> JK> +static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
> [SNIP]
>       Hello, Adam, Greg and other.
> As I think in this section of kernel it's not necessarily to use
> __devinit and __devexit.
> Soundcards(and other devices) can't be HotPlug as I know.
> And if we look at #define of this attributes, then we see that
> it useless with not HotPlug devices.
>
> 180 #ifdef CONFIG_HOTPLUG
> 181 #define __devinit
> 182 #define __devinitdata
> 183 #define __devexit
> 184 #define __devexitdata
> 185 #else
> 186 #define __devinit __init
> 187 #define __devinitdata __initdata
> 188 #define __devexit __exit
> 189 #define __devexitdata __exitdata
> 190 #endif
> And with changes from __init to __devinit and enabled CONFIG_HOTPLUG
> we loose advantage of __init.
> May be I've missed something?
>        Best regards, Ruslan.

Yes, I agree.  We should be using init for these particular drivers.  PnPBIOS
devices may be on docking stations and I'd like to leave them as __devinit but
for strictly isapnp devices such as these, init makes sense.  I'll add this to
my tree.

Thanks for bringing this to my attention.

-Adam

Re: [PATCH 2.5.65] pnp api changes to sound/isa/sb/es968.c

[Adam Belay]

Thanks for submitting this patch.  I'll look over it and add it to my tree.

Please note that the following ALSA drivers have now been converted.

ALS100
AZT2320
SB16 and AWE PnP
es968

Patches for these drivers and others will be available soon.

Thanks,
Adam