|
@@ -203,7 +203,6 @@ struct platform_device *of_platform_device_create_pdata(
|
|
|
struct device *parent)
|
|
|
{
|
|
|
struct platform_device *dev;
|
|
|
- int rc;
|
|
|
|
|
|
if (!of_device_is_available(np))
|
|
|
return NULL;
|
|
@@ -215,24 +214,16 @@ struct platform_device *of_platform_device_create_pdata(
|
|
|
#if defined(CONFIG_MICROBLAZE)
|
|
|
dev->archdata.dma_mask = 0xffffffffUL;
|
|
|
#endif
|
|
|
- dev->name = dev_name(&dev->dev);
|
|
|
dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
|
|
|
+ dev->dev.bus = &platform_bus_type;
|
|
|
dev->dev.platform_data = platform_data;
|
|
|
- dev->dev.id = PLATFORM_DEVID_NONE;
|
|
|
- /* device_add will assume that this device is on the same node as
|
|
|
- * the parent. If there is no parent defined, set the node
|
|
|
- * explicitly */
|
|
|
- if (!parent)
|
|
|
- set_dev_node(&dev->dev, of_node_to_nid(np));
|
|
|
|
|
|
/* We do not fill the DMA ops for platform devices by default.
|
|
|
* This is currently the responsibility of the platform code
|
|
|
* to do such, possibly using a device notifier
|
|
|
*/
|
|
|
|
|
|
- rc = platform_device_add(dev);
|
|
|
- if (rc) {
|
|
|
- dev_err(&dev->dev, "device registration failed\n");
|
|
|
+ if (of_device_add(dev) != 0) {
|
|
|
platform_device_put(dev);
|
|
|
return NULL;
|
|
|
}
|