Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9743042 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.15-rc1' of... 

Merge tag 'driver-core-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here is the set of driver core / debugfs patches for 4.15-rc1.

  Not many here, mostly all are debugfs fixes to resolve some
  long-reported problems with files going away with references to them
  in userspace. There's also some SPDX cleanups for the debugfs code, as
  well as a few other minor driver core changes for issues reported by
  people.

  All of these have been in linux-next for a week or more with no
  reported issues"

* tag 'driver-core-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Fix device link deferred probe
  debugfs: Remove redundant license text
  debugfs: add SPDX identifiers to all debugfs files
  debugfs: defer debugfs_fsdata allocation to first usage
  debugfs: call debugfs_real_fops() only after debugfs_file_get()
  debugfs: purge obsolete SRCU based removal protection
  IB/hfi1: convert to debugfs_file_get() and -put()
  debugfs: convert to debugfs_file_get() and -put()
  debugfs: debugfs_real_fops(): drop __must_hold sparse annotation
  debugfs: implement per-file removal protection
  debugfs: add support for more elaborate ->d_fsdata
  driver core: Move device_links_purge() after bus_remove_device()
  arch_topology: Fix section miss match warning due to free_raw_capacity()
  driver-core: pr_err() strings should end with newlines
parents e60e1ee6 0ff26c66

drivers/base/arch_topology.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ subsys_initcall(register_cpu_capacity_sysctl); 
static u32 capacity_scale;

static u32 capacity_scale;

static u32 *raw_capacity;

static u32 *raw_capacity;





static int __init free_raw_capacity(void)

static int free_raw_capacity(void)

{

{

	kfree(raw_capacity);

	kfree(raw_capacity);

	raw_capacity = NULL;

	raw_capacity = NULL;

drivers/base/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1958,7 +1958,6 @@ void device_del(struct device *dev) 
		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

					     BUS_NOTIFY_DEL_DEVICE, dev);

					     BUS_NOTIFY_DEL_DEVICE, dev);





	device_links_purge(dev);

	dpm_sysfs_remove(dev);

	dpm_sysfs_remove(dev);

	if (parent)

	if (parent)

		klist_del(&dev->p->knode_parent);

		klist_del(&dev->p->knode_parent);
@@ -1986,6 +1985,7 @@ void device_del(struct device *dev) 
	device_pm_remove(dev);

	device_pm_remove(dev);

	driver_deferred_probe_del(dev);

	driver_deferred_probe_del(dev);

	device_remove_properties(dev);

	device_remove_properties(dev);

	device_links_purge(dev);





	/* Notify the platform of the removal, in case they

	/* Notify the platform of the removal, in case they

	 * need to do anything...

	 * need to do anything...

drivers/base/dd.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -350,6 +350,15 @@ EXPORT_SYMBOL_GPL(device_bind_driver); 
static atomic_t probe_count = ATOMIC_INIT(0);

static atomic_t probe_count = ATOMIC_INIT(0);

static DECLARE_WAIT_QUEUE_HEAD(probe_waitqueue);

static DECLARE_WAIT_QUEUE_HEAD(probe_waitqueue);





static void driver_deferred_probe_add_trigger(struct device *dev,

					      int local_trigger_count)

{

	driver_deferred_probe_add(dev);

	/* Did a trigger occur while probing? Need to re-trigger if yes */

	if (local_trigger_count != atomic_read(&deferred_trigger_count))

		driver_deferred_probe_trigger();

}



static int really_probe(struct device *dev, struct device_driver *drv)

static int really_probe(struct device *dev, struct device_driver *drv)

{

{

	int ret = -EPROBE_DEFER;

	int ret = -EPROBE_DEFER;
@@ -369,6 +378,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
	}

	}





	ret = device_links_check_suppliers(dev);

	ret = device_links_check_suppliers(dev);

	if (ret == -EPROBE_DEFER)

		driver_deferred_probe_add_trigger(dev, local_trigger_count);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -470,10 +481,7 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
	case -EPROBE_DEFER:

	case -EPROBE_DEFER:

		/* Driver requested deferred probing */

		/* Driver requested deferred probing */

		dev_dbg(dev, "Driver %s requests probe deferral\n", drv->name);

		dev_dbg(dev, "Driver %s requests probe deferral\n", drv->name);

		driver_deferred_probe_add(dev);

		driver_deferred_probe_add_trigger(dev, local_trigger_count);

		/* Did a trigger occur while probing? Need to re-trigger if yes */

		if (local_trigger_count != atomic_read(&deferred_trigger_count))

			driver_deferred_probe_trigger();

		break;

		break;

	case -ENODEV:

	case -ENODEV:

	case -ENXIO:

	case -ENXIO:

drivers/base/test/test_async_driver_probe.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ static int __init test_async_probe_init(void) 
						      NULL, 0);

						      NULL, 0);

	if (IS_ERR(async_dev_1)) {

	if (IS_ERR(async_dev_1)) {

		error = PTR_ERR(async_dev_1);

		error = PTR_ERR(async_dev_1);

		pr_err("failed to create async_dev_1: %d", error);

		pr_err("failed to create async_dev_1: %d\n", error);

		return error;

		return error;

	}

	}
@@ -91,7 +91,7 @@ static int __init test_async_probe_init(void) 
						      NULL, 0);

						      NULL, 0);

	if (IS_ERR(async_dev_2)) {

	if (IS_ERR(async_dev_2)) {

		error = PTR_ERR(async_dev_2);

		error = PTR_ERR(async_dev_2);

		pr_err("failed to create async_dev_2: %d", error);

		pr_err("failed to create async_dev_2: %d\n", error);

		goto err_unregister_async_driver;

		goto err_unregister_async_driver;

	}

	}
@@ -118,7 +118,7 @@ static int __init test_async_probe_init(void) 
						     NULL, 0);

						     NULL, 0);

	if (IS_ERR(sync_dev_1)) {

	if (IS_ERR(sync_dev_1)) {

		error = PTR_ERR(sync_dev_1);

		error = PTR_ERR(sync_dev_1);

		pr_err("failed to create sync_dev_1: %d", error);

		pr_err("failed to create sync_dev_1: %d\n", error);

		goto err_unregister_sync_driver;

		goto err_unregister_sync_driver;

	}

	}

drivers/infiniband/hw/hfi1/debugfs.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -71,13 +71,13 @@ static ssize_t hfi1_seq_read( 
	loff_t *ppos)

	loff_t *ppos)

{

{

	struct dentry *d = file->f_path.dentry;

	struct dentry *d = file->f_path.dentry;

	int srcu_idx;

	ssize_t r;

	ssize_t r;





	r = debugfs_use_file_start(d, &srcu_idx);

	r = debugfs_file_get(d);

	if (likely(!r))

	if (unlikely(r))

		return r;

	r = seq_read(file, buf, size, ppos);

	r = seq_read(file, buf, size, ppos);

	debugfs_use_file_finish(srcu_idx);

	debugfs_file_put(d);

	return r;

	return r;

}

}
@@ -87,13 +87,13 @@ static loff_t hfi1_seq_lseek( 
	int whence)

	int whence)

{

{

	struct dentry *d = file->f_path.dentry;

	struct dentry *d = file->f_path.dentry;

	int srcu_idx;

	loff_t r;

	loff_t r;





	r = debugfs_use_file_start(d, &srcu_idx);

	r = debugfs_file_get(d);

	if (likely(!r))

	if (unlikely(r))

		return r;

	r = seq_lseek(file, offset, whence);

	r = seq_lseek(file, offset, whence);

	debugfs_use_file_finish(srcu_idx);

	debugfs_file_put(d);

	return r;

	return r;

}

}