From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Oct 2011 04:51:35 +0000 (+1100)
Subject: Merge remote-tracking branch 'driver-core/driver-core-next'
X-Git-Tag: next-20111007~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9fb956f547b50b6490c2a9ea44713ac0aad01ed3;p=karo-tx-linux.git

Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
	arch/arm/plat-mxc/devices.c
---

9fb956f547b50b6490c2a9ea44713ac0aad01ed3
diff --cc arch/arm/plat-mxc/devices.c
index 5aaa8c5f3420,a34b2ae895f2..4d55a7a26e98
--- a/arch/arm/plat-mxc/devices.c
+++ b/arch/arm/plat-mxc/devices.c
@@@ -23,59 -23,20 +23,6 @@@
  #include <linux/platform_device.h>
  #include <mach/common.h>
  
- struct platform_device *__init imx_add_platform_device_dmamask(
- 		const char *name, int id,
- 		const struct resource *res, unsigned int num_resources,
- 		const void *data, size_t size_data, u64 dmamask)
 -int __init mxc_register_device(struct platform_device *pdev, void *data)
--{
- 	int ret = -ENOMEM;
- 	struct platform_device *pdev;
- 
- 	pdev = platform_device_alloc(name, id);
- 	if (!pdev)
- 		goto err;
- 
- 	if (dmamask) {
- 		/*
- 		 * This memory isn't freed when the device is put,
- 		 * I don't have a nice idea for that though.  Conceptually
- 		 * dma_mask in struct device should not be a pointer.
- 		 * See http://thread.gmane.org/gmane.linux.kernel.pci/9081
- 		 */
- 		pdev->dev.dma_mask =
- 			kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
- 		if (!pdev->dev.dma_mask)
- 			/* ret is still -ENOMEM; */
- 			goto err;
- 
- 		*pdev->dev.dma_mask = dmamask;
- 		pdev->dev.coherent_dma_mask = dmamask;
- 	}
- 
- 	if (res) {
- 		ret = platform_device_add_resources(pdev, res, num_resources);
- 		if (ret)
- 			goto err;
- 	}
 -	int ret;
--
- 	if (data) {
- 		ret = platform_device_add_data(pdev, data, size_data);
- 		if (ret)
- 			goto err;
- 	}
 -	pdev->dev.platform_data = data;
--
- 	ret = platform_device_add(pdev);
- 	if (ret) {
- err:
- 		if (dmamask)
- 			kfree(pdev->dev.dma_mask);
- 		platform_device_put(pdev);
- 		return ERR_PTR(ret);
- 	}
 -	ret = platform_device_register(pdev);
 -	if (ret)
 -		pr_debug("Unable to register platform device '%s': %d\n",
 -			 pdev->name, ret);
--
- 	return pdev;
 -	return ret;
--}
--
  struct device mxc_aips_bus = {
  	.init_name	= "mxc_aips",
  	.parent		= &platform_bus,