Commit 2cd38fd1 authored by Saravana Kannan's avatar Saravana Kannan Committed by Greg Kroah-Hartman
Browse files

driver core: Remove unnecessary is_fwnode_dev variable in device_add() 



That variable is no longer necessary. Remove it and also fix a minor
typo in comments.

Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20200520034824.79049-2-saravanak@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 114dbb4f

drivers/base/core.c

+4 −8
Original line number Diff line number Diff line
@@ -2526,7 +2526,6 @@ int device_add(struct device *dev) 
	struct class_interface *class_intf;

	int error = -EINVAL;

	struct kobject *glue_dir = NULL;

	bool is_fwnode_dev = false;



	dev = get_device(dev);

	if (!dev)
@@ -2624,11 +2623,6 @@ int device_add(struct device *dev) 


	kobject_uevent(&dev->kobj, KOBJ_ADD);



	if (dev->fwnode && !dev->fwnode->dev) {

		dev->fwnode->dev = dev;

		is_fwnode_dev = true;

	}



	/*

	 * Check if any of the other devices (consumers) have been waiting for

	 * this device (supplier) to be added so that they can create a device
@@ -2637,12 +2631,14 @@ int device_add(struct device *dev) 
	 * This needs to happen after device_pm_add() because device_link_add()

	 * requires the supplier be registered before it's called.

	 *

	 * But this also needs to happe before bus_probe_device() to make sure

	 * But this also needs to happen before bus_probe_device() to make sure

	 * waiting consumers can link to it before the driver is bound to the

	 * device and the driver sync_state callback is called for this device.

	 */

	if (is_fwnode_dev)

	if (dev->fwnode && !dev->fwnode->dev) {

		dev->fwnode->dev = dev;

		fw_devlink_link_device(dev);

	}



	bus_probe_device(dev);

	if (parent)

CRA Git | Maintained and supported by SUSTech CRA and CCSE