Commit 7c2bc4ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-6.3-rc1_2' of... 

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

Pull driver core fixes from Greg KH:
 "Here is another small set of driver core patches.

  They resolve some reported problems with the previous driver core
  patches that are in your tree.

  They solve a problem with the bus_type cleanup as reported and fixed
  by Geert, and two fw_devlink changes to make debugging problems
  easier.

  There is one known outstanding problem with the fw_deflink changes in
  your tree that is still being worked on, and it looks like a clk core
  change will be submitted soon for that, probably after 6.3-rc1.

  All three of these have been in linux-next with no reported problems
  (only reports that they fixed problems)"

* tag 'driver-core-6.3-rc1_2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: fw_devlink: Print full path and name of fwnode
  driver core: fw_devlink: Avoid spurious error message
  driver core: bus: Handle early calls to bus_to_subsys()
parents 093b2dc4 0c058fb9

drivers/base/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct subsys_private *bus_to_subsys(const struct bus_type *bus) 
	struct subsys_private *sp = NULL;

	struct kobject *kobj;



	if (!bus)

	if (!bus || !bus_kset)

		return NULL;



	spin_lock(&bus_kset->list_lock);

drivers/base/core.c

+6 −6
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int __fwnode_link_add(struct fwnode_handle *con, 


	list_add(&link->s_hook, &sup->consumers);

	list_add(&link->c_hook, &con->suppliers);

	pr_debug("%pfwP Linked as a fwnode consumer to %pfwP\n",

	pr_debug("%pfwf Linked as a fwnode consumer to %pfwf\n",

		 con, sup);



	return 0;
@@ -122,7 +122,7 @@ int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup) 
 */

static void __fwnode_link_del(struct fwnode_link *link)

{

	pr_debug("%pfwP Dropping the fwnode link to %pfwP\n",

	pr_debug("%pfwf Dropping the fwnode link to %pfwf\n",

		 link->consumer, link->supplier);

	list_del(&link->s_hook);

	list_del(&link->c_hook);
@@ -1062,7 +1062,7 @@ int device_links_check_suppliers(struct device *dev) 
		if (!dev_is_best_effort(dev)) {

			fwnode_ret = -EPROBE_DEFER;

			dev_err_probe(dev, -EPROBE_DEFER,

				    "wait for supplier %pfwP\n", sup_fw);

				    "wait for supplier %pfwf\n", sup_fw);

		} else {

			fwnode_ret = -EAGAIN;

		}
@@ -2046,9 +2046,9 @@ static int fw_devlink_create_devlink(struct device *con, 
			goto out;

		}



		if (!device_link_add(con, sup_dev, flags)) {

			dev_err(con, "Failed to create device link with %s\n",

				dev_name(sup_dev));

		if (con != sup_dev && !device_link_add(con, sup_dev, flags)) {

			dev_err(con, "Failed to create device link (0x%x) with %s\n",

				flags, dev_name(sup_dev));

			ret = -EINVAL;

		}