Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
  mm: memory hotplug: Check if pages are correctly reserved on a per-section basis
  Revert "memory hotplug: Correct page reservation checking"
  Update email address for stable patch submission
  dynamic_debug: fix undefined reference to `__netdev_printk'
  dynamic_debug: use a single printk() to emit messages
  dynamic_debug: remove num_enabled accounting
  dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
  uio: Support physical addresses >32 bits on 32-bit systems
  sysfs: add unsigned long cast to prevent compile warning
  drivers: base: print rejected matches with DEBUG_DRIVER
  memory hotplug: Correct page reservation checking
  memory hotplug: Refuse to add unaligned memory regions
  remove the messy code file Documentation/zh_CN/SubmitChecklist
  ARM: mxc: convert device creation to use platform_device_register_full
  new helper to create platform devices with dma mask
  docs/driver-model: Update device class docs
  docs/driver-model: Document device.groups
  kobj_uevent: Ignore if some listeners cannot handle message
  dynamic_debug: make netif_dbg() call __netdev_printk()
  dynamic_debug: make netdev_dbg() call __netdev_printk()
  ...

1 files changed, 33 insertions, 21 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 99a5272d7c2f..7a24895543e7 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -375,52 +375,64 @@ void platform_device_unregister(struct platform_device *pdev)
 EXPORT_SYMBOL_GPL(platform_device_unregister);
 
 /**
- * platform_device_register_resndata - add a platform-level device with
+ * platform_device_register_full - add a platform-level device with
  * resources and platform-specific data
  *
- * @parent: parent device for the device we're adding
- * @name: base name of the device we're adding
- * @id: instance id
- * @res: set of resources that needs to be allocated for the device
- * @num: number of resources
- * @data: platform specific data for this platform device
- * @size: size of platform specific data
+ * @pdevinfo: data used to create device
  *
  * Returns &struct platform_device pointer on success, or ERR_PTR() on error.
  */
-struct platform_device *platform_device_register_resndata(
-                struct device *parent,
-                const char *name, int id,
-                const struct resource *res, unsigned int num,
-                const void *data, size_t size)
+struct platform_device *platform_device_register_full(
+                struct platform_device_info *pdevinfo)
 {
         int ret = -ENOMEM;
         struct platform_device *pdev;
 
-        pdev = platform_device_alloc(name, id);
+        pdev = platform_device_alloc(pdevinfo->name, pdevinfo->id);
         if (!pdev)
-                goto err;
-
-        pdev->dev.parent = parent;
+                goto err_alloc;
+
+        pdev->dev.parent = pdevinfo->parent;
+
+        if (pdevinfo->dma_mask) {
+                /*
+                 * 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)
+                        goto err;
+
+                *pdev->dev.dma_mask = pdevinfo->dma_mask;
+                pdev->dev.coherent_dma_mask = pdevinfo->dma_mask;
+        }
 
-        ret = platform_device_add_resources(pdev, res, num);
+        ret = platform_device_add_resources(pdev,
+                        pdevinfo->res, pdevinfo->num_res);
         if (ret)
                 goto err;
 
-        ret = platform_device_add_data(pdev, data, size);
+        ret = platform_device_add_data(pdev,
+                        pdevinfo->data, pdevinfo->size_data);
         if (ret)
                 goto err;
 
         ret = platform_device_add(pdev);
         if (ret) {
 err:
+                kfree(pdev->dev.dma_mask);
+
+err_alloc:
                 platform_device_put(pdev);
                 return ERR_PTR(ret);
         }
 
         return pdev;
 }
-EXPORT_SYMBOL_GPL(platform_device_register_resndata);
+EXPORT_SYMBOL_GPL(platform_device_register_full);
 
 static int platform_drv_probe(struct device *_dev)
 {
@@ -614,7 +626,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
                 return rc;
 
         add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
-                (pdev->id_entry) ? pdev->id_entry->name : pdev->name);
+                        pdev->name);
         return 0;
 }