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

Commit aa0a2ddc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] 64bit resource: fix up printks for resources in sound drivers 



This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>

Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 740e518e

sound/arm/aaci.c

+3 −2
Original line number Diff line number Diff line
@@ -779,8 +779,9 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev) 
	strlcpy(card->driver, DRIVER_NAME, sizeof(card->driver));

	strlcpy(card->shortname, "ARM AC'97 Interface", sizeof(card->shortname));

	snprintf(card->longname, sizeof(card->longname),

		 "%s at 0x%08lx, irq %d",

		 card->shortname, dev->res.start, dev->irq[0]);

		 "%s at 0x%016llx, irq %d",

		 card->shortname, (unsigned long long)dev->res.start,

		 dev->irq[0]);



	aaci = card->private_data;

	mutex_init(&aaci->ac97_sem);

sound/drivers/mpu401/mpu401.c

+3 −2
Original line number Diff line number Diff line
@@ -160,8 +160,9 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device, 
		return -ENODEV;

	}

	if (pnp_port_len(device, 0) < IO_EXTENT) {

		snd_printk(KERN_ERR "PnP port length is %ld, expected %d\n",

			   pnp_port_len(device, 0), IO_EXTENT);

		snd_printk(KERN_ERR "PnP port length is %llu, expected %d\n",

			   (unsigned long long)pnp_port_len(device, 0),

			   IO_EXTENT);

		return -ENODEV;

	}

	port[dev] = pnp_port_start(device, 0);

sound/isa/es18xx.c

+2 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,8 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, 
		kfree(cfg);

		return -EAGAIN;

	}

	snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0));

	snd_printdd("pnp: port=0x%llx\n",

			(unsigned long long)pnp_port_start(acard->devc, 0));

	/* PnP initialization */

	pdev = acard->dev;

	pnp_init_resource_table(cfg);

sound/isa/gus/interwave.c

+4 −4
Original line number Diff line number Diff line
@@ -611,10 +611,10 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard, 
	if (dma2[dev] >= 0)

		dma2[dev] = pnp_dma(pdev, 1);

	irq[dev] = pnp_irq(pdev, 0);

	snd_printdd("isapnp IW: sb port=0x%lx, gf1 port=0x%lx, codec port=0x%lx\n",

				pnp_port_start(pdev, 0),

				pnp_port_start(pdev, 1),

				pnp_port_start(pdev, 2));

	snd_printdd("isapnp IW: sb port=0x%llx, gf1 port=0x%llx, codec port=0x%llx\n",

			(unsigned long long)pnp_port_start(pdev, 0),

			(unsigned long long)pnp_port_start(pdev, 1),

			(unsigned long long)pnp_port_start(pdev, 2));

	snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]);

#ifdef SNDRV_STB

	/* Tone Control initialization */

sound/isa/sb/sb16.c

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard, 
			goto __wt_error; 

		} 

		awe_port[dev] = pnp_port_start(pdev, 0);

		snd_printdd("pnp SB16: wavetable port=0x%lx\n", pnp_port_start(pdev, 0));

		snd_printdd("pnp SB16: wavetable port=0x%llx\n",

				(unsigned long long)pnp_port_start(pdev, 0));

	} else {

__wt_error:

		if (pdev) {