[alsa-devel] [PATCH 6/6] [ALSA] portman2x4 - use new parport device model

[Takashi Iwai]

On Thu, 07 Jan 2016 08:15:51 +0100,
Sudip Mukherjee wrote:
> 
> Modify portman driver to use the new parallel port device model.
> 
> Signed-off-by: Sudip Mukherjee <sudip at vectorindia.org>

Did you actually test this?

Also about the changes:

> ---
>  sound/drivers/portman2x4.c | 24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
> index 5fcde7d..88b25ca 100644
> --- a/sound/drivers/portman2x4.c
> +++ b/sound/drivers/portman2x4.c
> @@ -704,9 +704,10 @@ static void snd_portman_detach(struct parport *p)
>  }
>  
>  static struct parport_driver portman_parport_driver = {
> -	.name   = "portman2x4",
> -	.attach = snd_portman_attach,
> -	.detach = snd_portman_detach
> +	.name		= "portman2x4",
> +	.match_port	= snd_portman_attach,
> +	.detach		= snd_portman_detach,
> +	.devmodel	= true,
>  };
>  
>  /*********************************************************************
> @@ -734,6 +735,7 @@ static int snd_portman_probe(struct platform_device *pdev)
>  	struct snd_card *card = NULL;
>  	struct portman *pm = NULL;
>  	int err;
> +	struct pardev_cb portman_cb;
>  
>  	p = platform_get_drvdata(pdev);
>  	platform_set_drvdata(pdev, NULL);
> @@ -758,13 +760,15 @@ static int snd_portman_probe(struct platform_device *pdev)
>  	sprintf(card->longname,  "%s at 0x%lx, irq %i",
>  		card->shortname, p->base, p->irq);
>  
> -	pardev = parport_register_device(p,                     /* port */
> -					 DRIVER_NAME,           /* name */
> -					 NULL,                  /* preempt */
> -					 NULL,                  /* wakeup */
> -					 snd_portman_interrupt, /* ISR */
> -					 PARPORT_DEV_EXCL,      /* flags */
> -					 (void *)card);         /* private */
> +	memset(&portman_cb, 0, sizeof(portman_cb));
> +	portman_cb.private = card;                      /* private */
> +	portman_cb.irq_func = snd_portman_interrupt;    /* ISR */
> +	portman_cb.flags = PARPORT_DEV_EXCL;            /* flags */

You can put them initializers except for private.  Then the explicit
memset can be omitted.

> +
> +	pardev = parport_register_dev_model(p,		   /* port */
> +					    DRIVER_NAME,   /* name */
> +					    &portman_cb,   /* callbacks */
> +					    device_count); /* device number */

Does device_count really work similarly for
parport_register_dev_model()?  I supposed the argument being the
device id number while you're passing the number of devices to
create.


Takashi


>  	if (!pardev) {
>  		snd_printd("Cannot register pardevice\n");
>  		err = -EIO;
> -- 
> 1.9.1
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>