Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0418ff0c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: remove direct access of dev->bus_id in sound/isa/* 



Removed the direct accesses of dev->bus_id in sound/isa/* by replacement
with dev_err() or dev_warn() functions.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bb072bf0

sound/isa/ad1848/ad1848.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -70,15 +70,15 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n) 
		return 0;

		return 0;





	if (port[n] == SNDRV_AUTO_PORT) {

	if (port[n] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id);

		dev_err(dev, "please specify port\n");

		return 0;

		return 0;

	}

	}

	if (irq[n] == SNDRV_AUTO_IRQ) {

	if (irq[n] == SNDRV_AUTO_IRQ) {

		snd_printk(KERN_ERR "%s: please specify irq\n", dev->bus_id);

		dev_err(dev, "please specify irq\n");

		return 0;	

		return 0;	

	}

	}

	if (dma1[n] == SNDRV_AUTO_DMA) {

	if (dma1[n] == SNDRV_AUTO_DMA) {

		snd_printk(KERN_ERR "%s: please specify dma1\n", dev->bus_id);

		dev_err(dev, "please specify dma1\n");

		return 0;

		return 0;

	}

	}

	return 1;

	return 1;

sound/isa/adlib.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ static int __devinit snd_adlib_match(struct device *dev, unsigned int n) 
		return 0;

		return 0;





	if (port[n] == SNDRV_AUTO_PORT) {

	if (port[n] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id);

		dev_err(dev, "please specify port\n");

		return 0;

		return 0;

	}

	}

	return 1;

	return 1;
@@ -55,13 +55,13 @@ static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) 




	card = snd_card_new(index[n], id[n], THIS_MODULE, 0);

	card = snd_card_new(index[n], id[n], THIS_MODULE, 0);

	if (!card) {

	if (!card) {

		snd_printk(KERN_ERR "%s: could not create card\n", dev->bus_id);

		dev_err(dev, "could not create card\n");

		return -EINVAL;

		return -EINVAL;

	}

	}





	card->private_data = request_region(port[n], 4, CRD_NAME);

	card->private_data = request_region(port[n], 4, CRD_NAME);

	if (!card->private_data) {

	if (!card->private_data) {

		snd_printk(KERN_ERR "%s: could not grab ports\n", dev->bus_id);

		dev_err(dev, "could not grab ports\n");

		error = -EBUSY;

		error = -EBUSY;

		goto out;

		goto out;

	}

	}
@@ -73,13 +73,13 @@ static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) 




	error = snd_opl3_create(card, port[n], port[n] + 2, OPL3_HW_AUTO, 1, &opl3);

	error = snd_opl3_create(card, port[n], port[n] + 2, OPL3_HW_AUTO, 1, &opl3);

	if (error < 0) {

	if (error < 0) {

		snd_printk(KERN_ERR "%s: could not create OPL\n", dev->bus_id);

		dev_err(dev, "could not create OPL\n");

		goto out;

		goto out;

	}

	}





	error = snd_opl3_hwdep_new(opl3, 0, 0, NULL);

	error = snd_opl3_hwdep_new(opl3, 0, 0, NULL);

	if (error < 0) {

	if (error < 0) {

		snd_printk(KERN_ERR "%s: could not create FM\n", dev->bus_id);

		dev_err(dev, "could not create FM\n");

		goto out;

		goto out;

	}

	}
@@ -87,7 +87,7 @@ static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) 




	error = snd_card_register(card);

	error = snd_card_register(card);

	if (error < 0) {

	if (error < 0) {

		snd_printk(KERN_ERR "%s: could not register card\n", dev->bus_id);

		dev_err(dev, "could not register card\n");

		goto out;

		goto out;

	}

	}

sound/isa/cs423x/cs4231.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -74,15 +74,15 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n) 
		return 0;

		return 0;





	if (port[n] == SNDRV_AUTO_PORT) {

	if (port[n] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id);

		dev_err(dev, "please specify port\n");

		return 0;

		return 0;

	}

	}

	if (irq[n] == SNDRV_AUTO_IRQ) {

	if (irq[n] == SNDRV_AUTO_IRQ) {

		snd_printk(KERN_ERR "%s: please specify irq\n", dev->bus_id);

		dev_err(dev, "please specify irq\n");

		return 0;

		return 0;

	}

	}

	if (dma1[n] == SNDRV_AUTO_DMA) {

	if (dma1[n] == SNDRV_AUTO_DMA) {

		snd_printk(KERN_ERR "%s: please specify dma1\n", dev->bus_id);

		dev_err(dev, "please specify dma1\n");

		return 0;

		return 0;

	}

	}

	return 1;

	return 1;
@@ -133,7 +133,7 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) 
					mpu_port[n], 0, mpu_irq[n],

					mpu_port[n], 0, mpu_irq[n],

					mpu_irq[n] >= 0 ? IRQF_DISABLED : 0,

					mpu_irq[n] >= 0 ? IRQF_DISABLED : 0,

					NULL) < 0)

					NULL) < 0)

			printk(KERN_WARNING "%s: MPU401 not detected\n", dev->bus_id);

			dev_warn(dev, "MPU401 not detected\n");

	}

	}





	snd_card_set_dev(card, dev);

	snd_card_set_dev(card, dev);

sound/isa/cs423x/cs4236.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -488,19 +488,19 @@ static int __devinit snd_cs423x_isa_match(struct device *pdev, 
		return 0;

		return 0;





	if (port[dev] == SNDRV_AUTO_PORT) {

	if (port[dev] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "%s: please specify port\n", pdev->bus_id);

		dev_err(pdev, "please specify port\n");

		return 0;

		return 0;

	}

	}

	if (cport[dev] == SNDRV_AUTO_PORT) {

	if (cport[dev] == SNDRV_AUTO_PORT) {

		snd_printk(KERN_ERR "%s: please specify cport\n", pdev->bus_id);

		dev_err(pdev, "please specify cport\n");

		return 0;

		return 0;

	}

	}

	if (irq[dev] == SNDRV_AUTO_IRQ) {

	if (irq[dev] == SNDRV_AUTO_IRQ) {

		snd_printk(KERN_ERR "%s: please specify irq\n", pdev->bus_id);

		dev_err(pdev, "please specify irq\n");

		return 0;

		return 0;

	}

	}

	if (dma1[dev] == SNDRV_AUTO_DMA) {

	if (dma1[dev] == SNDRV_AUTO_DMA) {

		snd_printk(KERN_ERR "%s: please specify dma1\n", pdev->bus_id);

		dev_err(pdev, "please specify dma1\n");

		return 0;

		return 0;

	}

	}

	return 1;

	return 1;

sound/isa/es1688/es1688.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -88,16 +88,14 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card, 
	if (irq[n] == SNDRV_AUTO_IRQ) {

	if (irq[n] == SNDRV_AUTO_IRQ) {

		irq[n] = snd_legacy_find_free_irq(possible_irqs);

		irq[n] = snd_legacy_find_free_irq(possible_irqs);

		if (irq[n] < 0) {

		if (irq[n] < 0) {

			snd_printk(KERN_ERR "%s: unable to find a free IRQ\n",

			dev_err(dev, "unable to find a free IRQ\n");

				dev->bus_id);

			return -EBUSY;

			return -EBUSY;

		}

		}

	}

	}

	if (dma8[n] == SNDRV_AUTO_DMA) {

	if (dma8[n] == SNDRV_AUTO_DMA) {

		dma8[n] = snd_legacy_find_free_dma(possible_dmas);

		dma8[n] = snd_legacy_find_free_dma(possible_dmas);

		if (dma8[n] < 0) {

		if (dma8[n] < 0) {

			snd_printk(KERN_ERR "%s: unable to find a free DMA\n",

			dev_err(dev, "unable to find a free DMA\n");

				dev->bus_id);

			return -EBUSY;

			return -EBUSY;

		}

		}

	}

	}
@@ -147,8 +145,7 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n) 




	if (snd_opl3_create(card, chip->port, chip->port + 2,

	if (snd_opl3_create(card, chip->port, chip->port + 2,

			OPL3_HW_OPL3, 0, &opl3) < 0)

			OPL3_HW_OPL3, 0, &opl3) < 0)

		printk(KERN_WARNING "%s: opl3 not detected at 0x%lx\n",

		dev_warn(dev, "opl3 not detected at 0x%lx\n", chip->port);

			dev->bus_id, chip->port);

	else {

	else {

		error =	snd_opl3_hwdep_new(opl3, 0, 1, NULL);

		error =	snd_opl3_hwdep_new(opl3, 0, 1, NULL);

		if (error < 0)

		if (error < 0)