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

Commit 31c095b0 authored by Jean-Baptiste Maneyrol's avatar Jean-Baptiste Maneyrol Committed by Jean Delvare
Browse files

i2c: Add request/release_mem_region to i2c-ibm_iic bus driver 



Reserving I/O memory for a driver with request_mem_region is necessary to
avoid memory access conflicts. Even if it's never going to happen, it is
cleaner and it allows to monitor I/O memory used in /proc/iomem.

Signed-off-by: default avatarJean-Baptiste Maneyrol <jean-baptiste.maneyrol@teamlog.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 41561f28

drivers/i2c/busses/i2c-ibm_iic.c

+9 −0
Original line number Diff line number Diff line
@@ -680,6 +680,12 @@ static int __devinit iic_probe(struct ocp_device *ocp){ 
	dev->idx = ocp->def->index;

	ocp_set_drvdata(ocp, dev);

	

	if (!request_mem_region(ocp->def->paddr, sizeof(struct iic_regs),

				"ibm_iic")) {

		ret = -EBUSY;

		goto fail1;

	}



	if (!(dev->vaddr = ioremap(ocp->def->paddr, sizeof(struct iic_regs)))){

		printk(KERN_CRIT "ibm-iic%d: failed to ioremap device registers\n",

			dev->idx);
@@ -750,6 +756,8 @@ fail: 


	iounmap(dev->vaddr);

fail2:	

	release_mem_region(ocp->def->paddr, sizeof(struct iic_regs));

fail1:

	ocp_set_drvdata(ocp, NULL);

	kfree(dev);	

	return ret;
@@ -777,6 +785,7 @@ static void __devexit iic_remove(struct ocp_device *ocp) 
		    free_irq(dev->irq, dev);

		}

		iounmap(dev->vaddr);

		release_mem_region(ocp->def->paddr, sizeof(struct iic_regs));

		kfree(dev);

	}

}