aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 15:05:51 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 15:05:51 -0500
commit06991c28f37ad68e5c03777f5c3b679b56e3dac1 (patch)
tree4be75788e21c3c644fe6d39abf47693a171cf4f8 /drivers/base/core.c
parent460dc1eecf37263c8e3b17685ef236f0d236facb (diff)
parent74fef7a8fd1d2bd94f925d6638bb4c3049e7c381 (diff)
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman: "Here is the big driver core merge for 3.9-rc1 There are two major series here, both of which touch lots of drivers all over the kernel, and will cause you some merge conflicts: - add a new function called devm_ioremap_resource() to properly be able to check return values. - remove CONFIG_EXPERIMENTAL Other than those patches, there's not much here, some minor fixes and updates" Fix up trivial conflicts * tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits) base: memory: fix soft/hard_offline_page permissions drivercore: Fix ordering between deferred_probe and exiting initcalls backlight: fix class_find_device() arguments TTY: mark tty_get_device call with the proper const values driver-core: constify data for class_find_device() firmware: Ignore abort check when no user-helper is used firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER firmware: Make user-mode helper optional firmware: Refactoring for splitting user-mode helper code Driver core: treat unregistered bus_types as having no devices watchdog: Convert to devm_ioremap_resource() thermal: Convert to devm_ioremap_resource() spi: Convert to devm_ioremap_resource() power: Convert to devm_ioremap_resource() mtd: Convert to devm_ioremap_resource() mmc: Convert to devm_ioremap_resource() mfd: Convert to devm_ioremap_resource() media: Convert to devm_ioremap_resource() iommu: Convert to devm_ioremap_resource() drm: Convert to devm_ioremap_resource() ...
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r--drivers/base/core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index a235085e343c..56536f4b0f6b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1617,9 +1617,9 @@ struct device *device_create(struct class *class, struct device *parent,
1617} 1617}
1618EXPORT_SYMBOL_GPL(device_create); 1618EXPORT_SYMBOL_GPL(device_create);
1619 1619
1620static int __match_devt(struct device *dev, void *data) 1620static int __match_devt(struct device *dev, const void *data)
1621{ 1621{
1622 dev_t *devt = data; 1622 const dev_t *devt = data;
1623 1623
1624 return dev->devt == *devt; 1624 return dev->devt == *devt;
1625} 1625}
@@ -1685,8 +1685,6 @@ EXPORT_SYMBOL_GPL(device_destroy);
1685 */ 1685 */
1686int device_rename(struct device *dev, const char *new_name) 1686int device_rename(struct device *dev, const char *new_name)
1687{ 1687{
1688 char *old_class_name = NULL;
1689 char *new_class_name = NULL;
1690 char *old_device_name = NULL; 1688 char *old_device_name = NULL;
1691 int error; 1689 int error;
1692 1690
@@ -1717,8 +1715,6 @@ int device_rename(struct device *dev, const char *new_name)
1717out: 1715out:
1718 put_device(dev); 1716 put_device(dev);
1719 1717
1720 kfree(new_class_name);
1721 kfree(old_class_name);
1722 kfree(old_device_name); 1718 kfree(old_device_name);
1723 1719
1724 return error; 1720 return error;