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

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

[PATCH] 64bit resource: fix up printks for resources in video 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 08f46de9

drivers/media/video/bt8xx/bttv-driver.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -4019,8 +4019,9 @@ static int __devinit bttv_probe(struct pci_dev *dev, 
	if (!request_mem_region(pci_resource_start(dev,0),

	if (!request_mem_region(pci_resource_start(dev,0),

				pci_resource_len(dev,0),

				pci_resource_len(dev,0),

				btv->c.name)) {

				btv->c.name)) {

		printk(KERN_WARNING "bttv%d: can't request iomem (0x%lx).\n",

		printk(KERN_WARNING "bttv%d: can't request iomem (0x%llx).\n",

		       btv->c.nr, pci_resource_start(dev,0));

		       btv->c.nr,

		       (unsigned long long)pci_resource_start(dev,0));

		return -EBUSY;

		return -EBUSY;

	}

	}

	pci_set_master(dev);

	pci_set_master(dev);
@@ -4031,8 +4032,9 @@ static int __devinit bttv_probe(struct pci_dev *dev, 
	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);

	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);

	printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ",

	printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ",

	       bttv_num,btv->id, btv->revision, pci_name(dev));

	       bttv_num,btv->id, btv->revision, pci_name(dev));

	printk("irq: %d, latency: %d, mmio: 0x%lx\n",

	printk("irq: %d, latency: %d, mmio: 0x%llx\n",

	       btv->c.pci->irq, lat, pci_resource_start(dev,0));

	       btv->c.pci->irq, lat,

	       (unsigned long long)pci_resource_start(dev,0));

	schedule();

	schedule();





	btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000);

	btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000);

drivers/media/video/cx88/cx88-alsa.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -712,9 +712,9 @@ static int __devinit snd_cx88_create(struct snd_card *card, 
	pci_read_config_byte(pci, PCI_LATENCY_TIMER,  &chip->pci_lat);

	pci_read_config_byte(pci, PCI_LATENCY_TIMER,  &chip->pci_lat);





	dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, "

	dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, "

	       "latency: %d, mmio: 0x%lx\n", core->name, devno,

	       "latency: %d, mmio: 0x%llx\n", core->name, devno,

	       pci_name(pci), chip->pci_rev, pci->irq,

	       pci_name(pci), chip->pci_rev, pci->irq,

	       chip->pci_lat,pci_resource_start(pci,0));

	       chip->pci_lat,(unsigned long long)pci_resource_start(pci,0));





	chip->irq = pci->irq;

	chip->irq = pci->irq;

	synchronize_irq(chip->irq);

	synchronize_irq(chip->irq);
@@ -766,8 +766,8 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci, 




	strcpy (card->driver, "CX88x");

	strcpy (card->driver, "CX88x");

	sprintf(card->shortname, "Conexant CX%x", pci->device);

	sprintf(card->shortname, "Conexant CX%x", pci->device);

	sprintf(card->longname, "%s at %#lx",

	sprintf(card->longname, "%s at %#llx",

		card->shortname, pci_resource_start(pci, 0));

		card->shortname,(unsigned long long)pci_resource_start(pci, 0));

	strcpy (card->mixername, "CX88");

	strcpy (card->mixername, "CX88");





	dprintk (0, "%s/%i: ALSA support for cx2388x boards\n",

	dprintk (0, "%s/%i: ALSA support for cx2388x boards\n",

drivers/media/video/cx88/cx88-core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1031,8 +1031,8 @@ static int get_ressources(struct cx88_core *core, struct pci_dev *pci) 
			       pci_resource_len(pci,0),

			       pci_resource_len(pci,0),

			       core->name))

			       core->name))

		return 0;

		return 0;

	printk(KERN_ERR "%s: can't get MMIO memory @ 0x%lx\n",

	printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",

	       core->name,pci_resource_start(pci,0));

	       core->name,(unsigned long long)pci_resource_start(pci,0));

	return -EBUSY;

	return -EBUSY;

}

}

drivers/media/video/cx88/cx88-mpeg.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -420,9 +420,9 @@ int cx8802_init_common(struct cx8802_dev *dev) 
	pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev);

	pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev);

	pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER,  &dev->pci_lat);

	pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER,  &dev->pci_lat);

	printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, "

	printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, "

	       "latency: %d, mmio: 0x%lx\n", dev->core->name,

	       "latency: %d, mmio: 0x%llx\n", dev->core->name,

	       pci_name(dev->pci), dev->pci_rev, dev->pci->irq,

	       pci_name(dev->pci), dev->pci_rev, dev->pci->irq,

	       dev->pci_lat,pci_resource_start(dev->pci,0));

	       dev->pci_lat,(unsigned long long)pci_resource_start(dev->pci,0));





	/* initialize driver struct */

	/* initialize driver struct */

	spin_lock_init(&dev->slock);

	spin_lock_init(&dev->slock);

drivers/media/video/cx88/cx88-video.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1847,9 +1847,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, 
	pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);

	pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);

	pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);

	pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);

	printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "

	printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "

	       "latency: %d, mmio: 0x%lx\n", core->name,

	       "latency: %d, mmio: 0x%llx\n", core->name,

	       pci_name(pci_dev), dev->pci_rev, pci_dev->irq,

	       pci_name(pci_dev), dev->pci_rev, pci_dev->irq,

	       dev->pci_lat,pci_resource_start(pci_dev,0));

	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));





	pci_set_master(pci_dev);

	pci_set_master(pci_dev);

	if (!pci_dma_supported(pci_dev,0xffffffff)) {

	if (!pci_dma_supported(pci_dev,0xffffffff)) {