linux-next: manual merge of the driver-core tree with the arm-soctree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/plat-mxc/devices.c between commit 160a84cfc975 ("ARM: mxc: drop
now unused function mxc_register_device") from the arm-soc tree and
commit 0e392412f334 ("ARM: mxc: convert device creation to use
platform_device_register_full") from the driver-core tree.

Just context changes.  I fixed it up (see below) anc can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/plat-mxc/devices.c
index 5aaa8c5,a34b2ae..0000000
--- 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 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;
- 	}
- 
- 	if (data) {
- 		ret = platform_device_add_data(pdev, data, size_data);
- 		if (ret)
- 			goto err;
- 	}
- 
- 	ret = platform_device_add(pdev);
- 	if (ret) {
- err:
- 		if (dmamask)
- 			kfree(pdev->dev.dma_mask);
- 		platform_device_put(pdev);
- 		return ERR_PTR(ret);
- 	}
- 
- 	return pdev;
- }
- 
 -int __init mxc_register_device(struct platform_device *pdev, void *data)
 -{
 -	int ret;
 -
 -	pdev->dev.platform_data = data;
 -
 -	ret = platform_device_register(pdev);
 -	if (ret)
 -		pr_debug("Unable to register platform device '%s': %d\n",
 -			 pdev->name, ret);
 -
 -	return ret;
 -}
 -
  struct device mxc_aips_bus = {
  	.init_name	= "mxc_aips",
  	.parent		= &platform_bus,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/