Commit 0fb7b6f9 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'driver-core/driver-core-next' 



Pull in dependent cgroup patches

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
parents 7e18e42e 61742a7c

Documentation/driver-api/driver-model/devres.rst

+0 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ IOMAP 
  devm_ioremap()

  devm_ioremap_uc()

  devm_ioremap_wc()

  devm_ioremap_np()

  devm_ioremap_resource() : checks resource, requests memory region, ioremaps

  devm_ioremap_resource_wc()

  devm_platform_ioremap_resource() : calls devm_ioremap_resource() for platform device

drivers/base/class.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ EXPORT_SYMBOL_GPL(__class_create); 
 */

void class_destroy(struct class *cls)

{

	if ((cls == NULL) || (IS_ERR(cls)))

	if (IS_ERR_OR_NULL(cls))

		return;



	class_unregister(cls);

drivers/base/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2509,7 +2509,7 @@ static ssize_t uevent_store(struct device *dev, struct device_attribute *attr, 
	rc = kobject_synth_uevent(&dev->kobj, buf, count);



	if (rc) {

		dev_err(dev, "uevent: failed to send synthetic uevent\n");

		dev_err(dev, "uevent: failed to send synthetic uevent: %d\n", rc);

		return rc;

	}

drivers/base/dd.c

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ static int __init save_async_options(char *buf) 
	if (strlen(buf) >= ASYNC_DRV_NAMES_MAX_LEN)

		pr_warn("Too long list of driver names for 'driver_async_probe'!\n");



	strlcpy(async_probe_drv_names, buf, ASYNC_DRV_NAMES_MAX_LEN);

	strscpy(async_probe_drv_names, buf, ASYNC_DRV_NAMES_MAX_LEN);

	async_probe_default = parse_option_str(async_probe_drv_names, "*");



	return 1;

drivers/base/devres.c

+3 −1
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ static __always_inline struct devres * alloc_dr(dr_release_t release, 
	if (unlikely(!dr))

		return NULL;



	/* No need to clear memory twice */

	if (!(gfp & __GFP_ZERO))

		memset(dr, 0, offsetof(struct devres, data));



	INIT_LIST_HEAD(&dr->node.entry);