Driver Core: constify the name passed to platform_device_register_simple

[linux-2.6-omap-h63xx.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index fb56092414821645342071f5c0da32ef2a486b4b..48d5db4f92ee1a3d30510d806102e15074f62bf6 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -360,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);
  *     the Linux driver model.  In particular, when such drivers are built
  *     as modules, they can't be "hotplugged".
  */
-struct platform_device *platform_device_register_simple(char *name, int id,
+struct platform_device *platform_device_register_simple(const char *name, int id,
                                                        struct resource *res, unsigned int num)
 {
        struct platform_device *pdev;
@@ -497,12 +497,12 @@ int __init_or_module platform_driver_probe(struct platform_driver *drv,
         * if the probe was successful, and make sure any forced probes of
         * new devices fail.
         */
-       spin_lock(&platform_bus_type.klist_drivers.k_lock);
+       spin_lock(&platform_bus_type.p->klist_drivers.k_lock);
        drv->probe = NULL;
-       if (code == 0 && list_empty(&drv->driver.klist_devices.k_list))
+       if (code == 0 && list_empty(&drv->driver.p->klist_devices.k_list))
                retval = -ENODEV;
        drv->driver.probe = platform_drv_probe_fail;
-       spin_unlock(&platform_bus_type.klist_drivers.k_lock);
+       spin_unlock(&platform_bus_type.p->klist_drivers.k_lock);
 
        if (code != retval)
                platform_driver_unregister(drv);