Commit 7240153a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge tag 'driver-core-5.11-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 driver core updates for 5.11-rc1

  This time there was a lot of different work happening here for some
  reason:

   - redo of the fwnode link logic, speeding it up greatly

   - auxiliary bus added (this was a tag that will be pulled in from
     other trees/maintainers this merge window as well, as driver
     subsystems started to rely on it)

   - platform driver core cleanups on the way to fixing some long-time
     api updates in future releases

   - minor fixes and tweaks.

  All have been in linux-next with no (finally) reported issues. Testing
  there did helped in shaking issues out a lot :)"

* tag 'driver-core-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (39 commits)
  driver core: platform: don't oops in platform_shutdown() on unbound devices
  ACPI: Use fwnode_init() to set up fwnode
  misc: pvpanic: Replace OF headers by mod_devicetable.h
  misc: pvpanic: Combine ACPI and platform drivers
  usb: host: sl811: Switch to use platform_get_mem_or_io()
  vfio: platform: Switch to use platform_get_mem_or_io()
  driver core: platform: Introduce platform_get_mem_or_io()
  dyndbg: fix use before null check
  soc: fix comment for freeing soc_dev_attr
  driver core: platform: use bus_type functions
  driver core: platform: change logic implementing platform_driver_probe
  driver core: platform: reorder functions
  driver core: make driver_probe_device() static
  driver core: Fix a couple of typos
  driver core: Reorder devices on successful probe
  driver core: Delete pointless parameter in fwnode_operations.add_links
  driver core: Refactor fw_devlink feature
  efi: Update implementation of add_links() to create fwnode links
  of: property: Update implementation of add_links() to create fwnode links
  driver core: Use device's fwnode to check if it is waiting for suppliers
  ...
parents 157f8098 46e85af0

drivers/acpi/property.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static bool acpi_nondev_subnode_extract(const union acpi_object *desc, 
		return false;



	dn->name = link->package.elements[0].string.pointer;

	dn->fwnode.ops = &acpi_data_fwnode_ops;

	fwnode_init(&dn->fwnode, &acpi_data_fwnode_ops);

	dn->parent = parent;

	INIT_LIST_HEAD(&dn->data.properties);

	INIT_LIST_HEAD(&dn->data.subnodes);

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1589,7 +1589,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, 
	device->device_type = type;

	device->handle = handle;

	device->parent = acpi_bus_get_parent(handle);

	device->fwnode.ops = &acpi_device_fwnode_ops;

	fwnode_init(&device->fwnode, &acpi_device_fwnode_ops);

	acpi_set_device_status(device, sta);

	acpi_device_get_busid(device);

	acpi_set_pnp_ids(handle, &device->pnp, type);

drivers/base/auxiliary.c

+8 −3
Original line number Diff line number Diff line
@@ -92,10 +92,15 @@ static int auxiliary_bus_remove(struct device *dev) 


static void auxiliary_bus_shutdown(struct device *dev)

{

	struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver);

	struct auxiliary_device *auxdev = to_auxiliary_dev(dev);

	struct auxiliary_driver *auxdrv = NULL;

	struct auxiliary_device *auxdev;



	if (dev->driver) {

		auxdrv = to_auxiliary_drv(dev->driver);

		auxdev = to_auxiliary_dev(dev);

	}



	if (auxdrv->shutdown)

	if (auxdrv && auxdrv->shutdown)

		auxdrv->shutdown(auxdev);

}

drivers/base/base.h

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ extern void device_release_driver_internal(struct device *dev, 
					   struct device *parent);



extern void driver_detach(struct device_driver *drv);

extern int driver_probe_device(struct device_driver *drv, struct device *dev);

extern void driver_deferred_probe_del(struct device *dev);

extern void device_set_deferred_probe_reason(const struct device *dev,

					     struct va_format *vaf);

drivers/base/class.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void class_create_release(struct class *cls) 
}



/**

 * class_create - create a struct class structure

 * __class_create - create a struct class structure

 * @owner: pointer to the module that is to "own" this struct class

 * @name: pointer to a string for the name of this class.

 * @key: the lock_class_key for this class; used by mutex lock debugging

CRA Git | Maintained and supported by SUSTech CRA and CCSE