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

Commit de5b3110 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] i2c-mpc.c: revert duplicate patch 



Seems that both Greg and I submitted the same patch and it just kept on
applying...

Cc: Greg KH <greg@kroah.com>
Cc: Kumar Gala <galak@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 697a2d63

drivers/i2c/busses/i2c-mpc.c

+0 −94
Original line number Diff line number Diff line
@@ -382,100 +382,6 @@ static void __exit fsl_i2c_exit(void) 
module_init(fsl_i2c_init);

module_exit(fsl_i2c_exit);



static int fsl_i2c_probe(struct device *device)

{

	int result = 0;

	struct mpc_i2c *i2c;

	struct platform_device *pdev = to_platform_device(device);

	struct fsl_i2c_platform_data *pdata;

	struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;



	if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {

		return -ENOMEM;

	}

	memset(i2c, 0, sizeof(*i2c));



	i2c->irq = platform_get_irq(pdev, 0);

	i2c->flags = pdata->device_flags;

	init_waitqueue_head(&i2c->queue);



	i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION);



	if (!i2c->base) {

		printk(KERN_ERR "i2c-mpc - failed to map controller\n");

		result = -ENOMEM;

		goto fail_map;

	}



	if (i2c->irq != 0)

		if ((result = request_irq(i2c->irq, mpc_i2c_isr,

					  SA_SHIRQ, "i2c-mpc", i2c)) < 0) {

			printk(KERN_ERR

			       "i2c-mpc - failed to attach interrupt\n");

			goto fail_irq;

		}



	mpc_i2c_setclock(i2c);

	dev_set_drvdata(device, i2c);



	i2c->adap = mpc_ops;

	i2c_set_adapdata(&i2c->adap, i2c);

	i2c->adap.dev.parent = &pdev->dev;

	if ((result = i2c_add_adapter(&i2c->adap)) < 0) {

		printk(KERN_ERR "i2c-mpc - failed to add adapter\n");

		goto fail_add;

	}



	return result;



      fail_add:

	if (i2c->irq != 0)

		free_irq(i2c->irq, NULL);

      fail_irq:

	iounmap(i2c->base);

      fail_map:

	kfree(i2c);

	return result;

};



static int fsl_i2c_remove(struct device *device)

{

	struct mpc_i2c *i2c = dev_get_drvdata(device);



	i2c_del_adapter(&i2c->adap);

	dev_set_drvdata(device, NULL);



	if (i2c->irq != 0)

		free_irq(i2c->irq, i2c);



	iounmap(i2c->base);

	kfree(i2c);

	return 0;

};



/* Structure for a device driver */

static struct device_driver fsl_i2c_driver = {

	.name = "fsl-i2c",

	.bus = &platform_bus_type,

	.probe = fsl_i2c_probe,

	.remove = fsl_i2c_remove,

};



static int __init fsl_i2c_init(void)

{

	return driver_register(&fsl_i2c_driver);

}



static void __exit fsl_i2c_exit(void)

{

	driver_unregister(&fsl_i2c_driver);

}



module_init(fsl_i2c_init);

module_exit(fsl_i2c_exit);



MODULE_AUTHOR("Adrian Cox <adrian@humboldt.co.uk>");

MODULE_DESCRIPTION

    ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");