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

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

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

Pull driver core updates from Greg KH:
 "Here is the "big" set of driver core changes for 5.13-rc1.

  Nothing major, just lots of little core changes and cleanups, notable
  things are:

   - finally set 'fw_devlink=on' by default.

     All reported issues with this have been shaken out over the past 9
     months or so, but we will be paying attention to any fallout here
     in case we need to revert this as the default boot value (symptoms
     of problems are a simple lack of booting)

   - fixes found to be needed by fw_devlink=on value in some subsystems
     (like clock).

   - delayed work initialization cleanup

   - driver core cleanups and minor updates

   - software node cleanups and tweaks

   - devtmpfs cleanups

   - minor debugfs cleanups

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

* tag 'driver-core-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (53 commits)
  devm-helpers: Fix devm_delayed_work_autocancel() kerneldoc
  PM / wakeup: use dev_set_name() directly
  software node: Allow node addition to already existing device
  kunit: software node: adhear to KUNIT formatting standard
  node: fix device cleanups in error handling code
  kobject_uevent: remove warning in init_uevent_argv()
  debugfs: Make debugfs_allow RO after init
  Revert "driver core: platform: Make platform_get_irq_optional() optional"
  media: ipu3-cio2: Switch to use SOFTWARE_NODE_REFERENCE()
  software node: Introduce SOFTWARE_NODE_REFERENCE() helper macro
  software node: Imply kobj_to_swnode() to be no-op
  software node: Deduplicate code in fwnode_create_software_node()
  software node: Introduce software_node_alloc()/software_node_free()
  software node: Free resources explicitly when swnode_register() fails
  debugfs: drop pointless nul-termination in debugfs_read_file_bool()
  driver core: add helper for deferred probe reason setting
  driver core: Improve fw_devlink & deferred_probe_timeout interaction
  of: property: fw_devlink: Add support for remote-endpoint
  driver core: platform: Make platform_get_irq_optional() optional
  driver core: Replace printf() specifier and drop unneeded casting
  ...
parents 8e3a3249 a943d763

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5197,6 +5197,12 @@ M: Torben Mathiasen <device@lanana.org> 
S:	Maintained

W:	http://lanana.org/docs/device-list/index.html









DEVICE RESOURCE MANAGEMENT HELPERS









M:	Hans de Goede <hdegoede@redhat.com>









R:	Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>









S:	Maintained









F:	include/linux/devm-helpers.h

















DEVICE-MAPPER  (LVM)









M:	Alasdair Kergon <agk@redhat.com>









M:	Mike Snitzer <snitzer@redhat.com>
































drivers/base/attribute_container.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -461,6 +461,10 @@ attribute_container_add_class_device(struct device *classdev)







/**









 * attribute_container_add_class_device_adapter - simple adapter for triggers









 *









 * @cont: the container to register.









 * @dev:  the generic device to activate the trigger for









 * @classdev:	the class device to add









 *









 * This function is identical to attribute_container_add_class_device except









 * that it is designed to be called from the triggers









 */
































drivers/base/auxiliary.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -265,8 +265,3 @@ void __init auxiliary_bus_init(void)







{









	WARN_ON(bus_register(&auxiliary_bus_type));









}


















MODULE_LICENSE("GPL v2");









MODULE_DESCRIPTION("Auxiliary Bus");









MODULE_AUTHOR("David Ertman <david.m.ertman@intel.com>");









MODULE_AUTHOR("Kiran Patil <kiran.patil@intel.com>");
























drivers/base/base.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -185,11 +185,13 @@ extern int device_links_read_lock(void);







extern void device_links_read_unlock(int idx);









extern int device_links_read_lock_held(void);









extern int device_links_check_suppliers(struct device *dev);









extern void device_links_force_bind(struct device *dev);









extern void device_links_driver_bound(struct device *dev);









extern void device_links_driver_cleanup(struct device *dev);









extern void device_links_no_driver(struct device *dev);









extern bool device_links_busy(struct device *dev);









extern void device_links_unbind_consumers(struct device *dev);









extern void fw_devlink_drivers_done(void);



















/* device pm support */









void device_pm_move_to_tail(struct device *dev);
































drivers/base/component.c



+3
−6






























Original line number
Diff line number
Diff line







@@ -65,7 +65,6 @@ struct master {







	const struct component_master_ops *ops;









	struct device *dev;









	struct component_match *match;









	struct dentry *dentry;









};



















struct component {








@@ -125,15 +124,13 @@ core_initcall(component_debug_init);

















static void component_master_debugfs_add(struct master *m)









{









	m->dentry = debugfs_create_file(dev_name(m->dev), 0444,









					component_debugfs_dir,









					m, &component_devices_fops);









	debugfs_create_file(dev_name(m->dev), 0444, component_debugfs_dir, m,









			    &component_devices_fops);









}



















static void component_master_debugfs_del(struct master *m)









{









	debugfs_remove(m->dentry);









	m->dentry = NULL;









	debugfs_remove(debugfs_lookup(dev_name(m->dev), component_debugfs_dir));









}



















#else