sound: struct device - replace bus_id with dev_name(), dev_set_name()
Subsystems (3)
Here the next round of sound stuff, which I didn't test or compile. Please let me know if there is anything to fix.
Thanks,
Kay
From: Kay Sievers <[email protected]>
Subject: sound: struct device - replace bus_id with dev_name(), dev_set_name()
--- sound/aoa/soundbus/core.c | 2 +- sound/drivers/ml403-ac97cr.c | 4 ++-- sound/isa/ad1848/ad1848.c | 6 +++--- sound/isa/adlib.c | 12 ++++++------ sound/isa/cs423x/cs4231.c | 8 ++++---- sound/isa/cs423x/cs4236.c | 8 ++++---- sound/isa/es1688/es1688.c | 6 +++--- sound/isa/gus/gusclassic.c | 8 ++++---- sound/isa/gus/gusextreme.c | 12 ++++++------ sound/isa/sb/sb8.c | 4 ++-- sound/soc/soc-core.c | 4 ++-- 11 files changed, 37 insertions(+), 37 deletions(-)
sound/aoa/soundbus/core.c +1 -1
@@ -176,7 +176,7 @@ int soundbus_add_one(struct soundbus_devreturn -EINVAL ; } -snprintf (dev->ofdev.dev.bus_id,BUS_ID_SIZE ,"soundbus:%x" , ++devcount); +dev_set_name (&dev->ofdev.dev,"soundbus:%x" , ++devcount); dev->ofdev.dev.bus = &soundbus_bus_type;return of_device_register (&dev->ofdev); }
sound/drivers/ml403-ac97cr.c +2 -2
@@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card/* get irq */ irq =platform_get_irq (pfdev,0 );if (request_irq (irq, snd_ml403_ac97cr_irq,IRQF_DISABLED , - pfdev->dev.bus_id, (void *)ml403_ac97cr)) { +dev_name (&pfdev->dev), (void *)ml403_ac97cr)) { snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": ""unable to grab IRQ %d\n" , irq);
@@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card ml403_ac97cr->irq); irq =platform_get_irq (pfdev,1 );if (request_irq (irq, snd_ml403_ac97cr_irq,IRQF_DISABLED , - pfdev->dev.bus_id, (void *)ml403_ac97cr)) { +dev_name (&pfdev->dev), (void *)ml403_ac97cr)) { snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": ""unable to grab IRQ %d\n" , irq);
sound/isa/ad1848/ad1848.c +3 -3
@@ -70,15 +70,15 @@ static int __devinit snd_ad1848_match(streturn 0 ;if (port[n] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (dev));return 0 ; }if (irq[n] ==SNDRV_AUTO_IRQ ) { -snd_printk (KERN_ERR "%s: please specify irq\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify irq\n" ,dev_name (dev));return 0 ; }if (dma1[n] ==SNDRV_AUTO_DMA ) { -snd_printk (KERN_ERR "%s: please specify dma1\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify dma1\n" ,dev_name (dev));return 0 ; }return 1 ;
sound/isa/adlib.c +6 -6
@@ -36,7 +36,7 @@ static int __devinit snd_adlib_match(strreturn 0 ;if (port[n] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (dev));return 0 ; }return 1 ;
@@ -55,13 +55,13 @@ static int __devinit snd_adlib_probe(str card =snd_card_new (index[n], id[n],THIS_MODULE ,0 );if (!card) { -snd_printk (KERN_ERR "%s: could not create card\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: could not create card\n" ,dev_name (dev));return -EINVAL ; } card->private_data =request_region (port[n],4 ,CRD_NAME );if (!card->private_data) { -snd_printk (KERN_ERR "%s: could not grab ports\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: could not grab ports\n" ,dev_name (dev)); error = -EBUSY ; goto out; }
@@ -73,13 +73,13 @@ static int __devinit snd_adlib_probe(str error =snd_opl3_create (card, port[n], port[n] +2 ,OPL3_HW_AUTO ,1 , &opl3);if (error <0 ) { -snd_printk (KERN_ERR "%s: could not create OPL\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: could not create OPL\n" ,dev_name (dev)); goto out; } error =snd_opl3_hwdep_new (opl3,0 ,0 ,NULL );if (error <0 ) { -snd_printk (KERN_ERR "%s: could not create FM\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: could not create FM\n" ,dev_name (dev)); goto out; }
@@ -87,7 +87,7 @@ static int __devinit snd_adlib_probe(str error =snd_card_register (card);if (error <0 ) { -snd_printk (KERN_ERR "%s: could not register card\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: could not register card\n" ,dev_name (dev)); goto out; }
sound/isa/cs423x/cs4231.c +4 -4
@@ -74,15 +74,15 @@ static int __devinit snd_cs4231_match(streturn 0 ;if (port[n] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (dev));return 0 ; }if (irq[n] ==SNDRV_AUTO_IRQ ) { -snd_printk (KERN_ERR "%s: please specify irq\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify irq\n" ,dev_name (dev));return 0 ; }if (dma1[n] ==SNDRV_AUTO_DMA ) { -snd_printk (KERN_ERR "%s: please specify dma1\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify dma1\n" ,dev_name (dev));return 0 ; }return 1 ;
@@ -133,7 +133,7 @@ static int __devinit snd_cs4231_probe(st mpu_port[n], 0, mpu_irq[n], mpu_irq[n] >= 0 ? IRQF_DISABLED : 0, NULL) < 0) -printk (KERN_WARNING "%s: MPU401 not detected\n" , dev->bus_id); +printk (KERN_WARNING "%s: MPU401 not detected\n" ,dev_name (dev)); }snd_card_set_dev (card, dev);
sound/isa/cs423x/cs4236.c +4 -4
@@ -488,19 +488,19 @@ static int __devinit snd_cs423x_isa_matcreturn 0 ;if (port[dev] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , pdev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (pdev));return 0 ; }if (cport[dev] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify cport\n" , pdev->bus_id); +snd_printk (KERN_ERR "%s: please specify cport\n" ,dev_name (pdev));return 0 ; }if (irq[dev] ==SNDRV_AUTO_IRQ ) { -snd_printk (KERN_ERR "%s: please specify irq\n" , pdev->bus_id); +snd_printk (KERN_ERR "%s: please specify irq\n" ,dev_name (pdev));return 0 ; }if (dma1[dev] ==SNDRV_AUTO_DMA ) { -snd_printk (KERN_ERR "%s: please specify dma1\n" , pdev->bus_id); +snd_printk (KERN_ERR "%s: please specify dma1\n" ,dev_name (pdev));return 0 ; }return 1 ;
sound/isa/es1688/es1688.c +3 -3
@@ -89,7 +89,7 @@ static int __devinit snd_es1688_legacy_c irq[n] =snd_legacy_find_free_irq (possible_irqs);if (irq[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free IRQ\n" , - dev->bus_id); +dev_name (dev));return -EBUSY ; } }
@@ -97,7 +97,7 @@ static int __devinit snd_es1688_legacy_c dma8[n] =snd_legacy_find_free_dma (possible_dmas);if (dma8[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free DMA\n" , - dev->bus_id); +dev_name (dev));return -EBUSY ; } }
@@ -148,7 +148,7 @@ static int __devinit snd_es1688_probe(stif (snd_opl3_create (card, chip->port, chip->port +2 ,OPL3_HW_OPL3 ,0 , &opl3) <0 )printk (KERN_WARNING "%s: opl3 not detected at 0x%lx\n" , - dev->bus_id, chip->port); +dev_name (dev), chip->port);else { error =snd_opl3_hwdep_new (opl3,0 ,1 ,NULL );if (error <0 )
sound/isa/gus/gusclassic.c +4 -4
@@ -91,7 +91,7 @@ static int __devinit snd_gusclassic_crea irq[n] =snd_legacy_find_free_irq (possible_irqs);if (irq[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free IRQ\n" , - dev->bus_id); +dev_name (dev));return -EBUSY ; } }
@@ -99,7 +99,7 @@ static int __devinit snd_gusclassic_crea dma1[n] =snd_legacy_find_free_dma (possible_dmas);if (dma1[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free DMA1\n" , - dev->bus_id); +dev_name (dev));return -EBUSY ; } }
@@ -107,7 +107,7 @@ static int __devinit snd_gusclassic_crea dma2[n] =snd_legacy_find_free_dma (possible_dmas);if (dma2[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free DMA2\n" , - dev->bus_id); +dev_name (dev));return -EBUSY ; } }
@@ -175,7 +175,7 @@ static int __devinit snd_gusclassic_prob error = -ENODEV ;if (gus->max_flag || gus->ess_flag) {snd_printk (KERN_ERR "%s: GUS Classic or ACE soundcard was " -"not detected at 0x%lx\n" , dev->bus_id, gus->gf1.port); +"not detected at 0x%lx\n" ,dev_name (dev), gus->gf1.port); goto out; }
sound/isa/gus/gusextreme.c +6 -6
@@ -107,7 +107,7 @@ static int __devinit snd_gusextreme_es16 irq[n] =snd_legacy_find_free_irq (possible_irqs);if (irq[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free IRQ " -"for ES1688\n" , dev->bus_id); +"for ES1688\n" ,dev_name (dev));return -EBUSY ; } }
@@ -115,7 +115,7 @@ static int __devinit snd_gusextreme_es16 dma8[n] =snd_legacy_find_free_dma (possible_dmas);if (dma8[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free DMA " -"for ES1688\n" , dev->bus_id); +"for ES1688\n" ,dev_name (dev));return -EBUSY ; } }
@@ -144,7 +144,7 @@ static int __devinit snd_gusextreme_gus_ gf1_irq[n] =snd_legacy_find_free_irq (possible_irqs);if (gf1_irq[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free IRQ " -"for GF1\n" , dev->bus_id); +"for GF1\n" ,dev_name (dev));return -EBUSY ; } }
@@ -152,7 +152,7 @@ static int __devinit snd_gusextreme_gus_ dma1[n] =snd_legacy_find_free_dma (possible_dmas);if (dma1[n] <0 ) {snd_printk (KERN_ERR "%s: unable to find a free DMA " -"for GF1\n" , dev->bus_id); +"for GF1\n" ,dev_name (dev));return -EBUSY ; } }
@@ -279,7 +279,7 @@ static int __devinit snd_gusextreme_prob error = -ENODEV ;if (!gus->ess_flag) {snd_printk (KERN_ERR "%s: GUS Extreme soundcard was not " -"detected at 0x%lx\n" , dev->bus_id, gus->gf1.port); +"detected at 0x%lx\n" ,dev_name (dev), gus->gf1.port); goto out; } gus->codec_flag =1 ;
@@ -311,7 +311,7 @@ static int __devinit snd_gusextreme_probif (snd_opl3_create (card, es1688->port, es1688->port +2 ,OPL3_HW_OPL3 ,0 , &opl3) <0 )printk (KERN_ERR "%s: opl3 not detected at 0x%lx\n" , - dev->bus_id, es1688->port); +dev_name (dev), es1688->port);else { error =snd_opl3_hwdep_new (opl3,0 ,2 ,NULL );if (error <0 )
sound/isa/sb/sb8.c +2 -2
@@ -85,11 +85,11 @@ static int __devinit snd_sb8_match(strucif (!enable[dev])return 0 ;if (irq[dev] ==SNDRV_AUTO_IRQ ) { -snd_printk (KERN_ERR "%s: please specify irq\n" , pdev->bus_id); +snd_printk (KERN_ERR "%s: please specify irq\n" ,dev_name (pdev));return 0 ; }if (dma8[dev] ==SNDRV_AUTO_DMA ) { -snd_printk (KERN_ERR "%s: please specify dma8\n" , pdev->bus_id); +snd_printk (KERN_ERR "%s: please specify dma8\n" ,dev_name (pdev));return 0 ; }return 1 ;
sound/soc/soc-core.c +2 -2
@@ -95,8 +95,8 @@ static int soc_ac97_dev_register(struct codec->ac97->dev.parent =NULL ; codec->ac97->dev.release = soc_ac97_device_release; -snprintf (codec->ac97->dev.bus_id,BUS_ID_SIZE ,"%d-%d:%s" , - codec->card->number,0 , codec->name); +dev_set_name (&codec->ac97->dev,"%d-%d:%s" , + codec->card->number,0 , codec->name); err =device_register (&codec->ac97->dev);if (err <0 ) {snd_printk (KERN_ERR "Can't register ac97 bus\n" );
At Sun, 02 Nov 2008 03:50:35 +0100,
sound/isa/ad1848/ad1848.c static int __devinit snd_ad1848_match(st · line 73
Quoted 9 lines · Kay Sievers
sound/isa/ad1848/ad1848.c +1
-1@@ -70,15 +70,15 @@ static int __devinit snd_ad1848_match(streturn 0 ;if (port[n] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (dev));
All the changes in sound/isa/* seem to be better fixed by replacement with dev_err().
Other changes look good to me.
thanks,
Takashi
At Sun, 02 Nov 2008 12:19:16 +0100,
Quoted 9 lines · I wrote:
At Sun, 02 Nov 2008 03:50:35 +0100,
Quoted 6 lines · Kay Sievers
sound/isa/ad1848/ad1848.c +0
-0@@ -70,15 +70,15 @@ static int __devinit snd_ad1848_match(streturn 0 ;
Quoted 8 lines
sound/isa/ad1848/ad1848.c static int __devinit snd_ad1848_match(st · line 73
Quoted 3 lines
sound/isa/ad1848/ad1848.c +1
-1if (port[n] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (dev));All the changes in
sound/isa/*seem to be better fixed by replacement withdev_err().Other changes look good to me.
I dropped sound/isa/* changes from your patch and applied to sound git tree now.
The sound/isa* parts are replacement with dev_err() and co as well, so there is no longer dev->bus_id in sound directory.
thanks,
Takashi
Quoted 18 lines · Takashi Iwai
At Sun, 02 Nov 2008 12:19:16 +0100,
Quoted 16 lines · I wrote:
At Sun, 02 Nov 2008 03:50:35 +0100,
sound/isa/ad1848/ad1848.c static int __devinit snd_ad1848_match(st · line 73
Quoted 9 lines · Kay Sievers
sound/isa/ad1848/ad1848.c +1
-1@@ -70,15 +70,15 @@ static int __devinit snd_ad1848_match(streturn 0 ;if (port[n] ==SNDRV_AUTO_PORT ) { -snd_printk (KERN_ERR "%s: please specify port\n" , dev->bus_id); +snd_printk (KERN_ERR "%s: please specify port\n" ,dev_name (dev));All the changes in
sound/isa/*seem to be better fixed by replacement withdev_err().
Quoted 7 lines
Quoted 1 line
Other changes look good to me.
I dropped
sound/isa/*changes from your patch and applied to sound git tree now.The
sound/isa*parts are replacement withdev_err()and co as well, so there is no longerdev->bus_idin sound directory.
Very nice. Thanks for your prompt reply, it helps a lot, Kay