Commit c6c3c570 authored Sep 01, 2021 by Linus Torvalds

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

Merge tag 'driver-core-5.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 big set of driver core patches for 5.15-rc1.

  These do change a number of different things across different
  subsystems, and because of that, there were 2 stable tags created that
  might have already come into your tree from different pulls that did
  the following

   - changed the bus remove callback to return void

   - sysfs iomem_get_mapping rework

  Other than those two things, there's only a few small things in here:

   - kernfs performance improvements for huge numbers of sysfs users at
     once

   - tiny api cleanups

   - other minor changes

  All of these have been in linux-next for a while with no reported
  problems, other than the before-mentioned merge issue"

* tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (33 commits)
  MAINTAINERS: Add dri-devel for component.[hc]
  driver core: platform: Remove platform_device_add_properties()
  ARM: tegra: paz00: Handle device properties with software node API
  bitmap: extend comment to bitmap_print_bitmask/list_to_buf
  drivers/base/node.c: use bin_attribute to break the size limitation of cpumap ABI
  topology: use bin_attribute to break the size limitation of cpumap ABI
  lib: test_bitmap: add bitmap_print_bitmask/list_to_buf test cases
  cpumask: introduce cpumap_print_list/bitmask_to_buf to support large bitmask and list
  sysfs: Rename struct bin_attribute member to f_mapping
  sysfs: Invoke iomem_get_mapping() from the sysfs open callback
  debugfs: Return error during {full/open}_proxy_open() on rmmod
  zorro: Drop useless (and hardly used) .driver member in struct zorro_dev
  zorro: Simplify remove callback
  sh: superhyway: Simplify check in remove callback
  nubus: Simplify check in remove callback
  nubus: Make struct nubus_driver::remove return void
  kernfs: dont call d_splice_alias() under kernfs node lock
  kernfs: use i_lock to protect concurrent inode updates
  kernfs: switch kernfs to use an rwsem
  kernfs: use VFS negative dentry caching
  ...

parents ba1dc7f2 049d1693

MAINTAINERS

+5 −0

Original line number	Diff line number	Diff line
		@@ -5725,6 +5725,11 @@ F: Documentation/admin-guide/blockdev/
		F: drivers/block/drbd/
		F: lib/lru_cache.c

		DRIVER COMPONENT FRAMEWORK
		L: dri-devel@lists.freedesktop.org
		F: drivers/base/component.c
		F: include/linux/component.h

		DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
		M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		R: "Rafael J. Wysocki" <rafael@kernel.org>

arch/arm/common/locomo.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -834,14 +834,13 @@ static int locomo_bus_probe(struct device *dev)
		return ret;
		}

		static int locomo_bus_remove(struct device *dev)
		static void locomo_bus_remove(struct device *dev)
		{
		struct locomo_dev *ldev = LOCOMO_DEV(dev);
		struct locomo_driver *drv = LOCOMO_DRV(dev->driver);

		if (drv->remove)
		drv->remove(ldev);
		return 0;
		}

		struct bus_type locomo_bus_type = {

arch/arm/common/sa1111.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1356,15 +1356,13 @@ static int sa1111_bus_probe(struct device *dev)
		return ret;
		}

		static int sa1111_bus_remove(struct device *dev)
		static void sa1111_bus_remove(struct device *dev)
		{
		struct sa1111_dev *sadev = to_sa1111_device(dev);
		struct sa1111_driver *drv = SA1111_DRV(dev->driver);

		if (drv->remove)
		drv->remove(sadev);

		return 0;
		}

		struct bus_type sa1111_bus_type = {

arch/arm/mach-rpc/ecard.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1052,7 +1052,7 @@ static int ecard_drv_probe(struct device *dev)
		return ret;
		}

		static int ecard_drv_remove(struct device *dev)
		static void ecard_drv_remove(struct device *dev)
		{
		struct expansion_card *ec = ECARD_DEV(dev);
		struct ecard_driver *drv = ECARD_DRV(dev->driver);
		@@ -1067,8 +1067,6 @@ static int ecard_drv_remove(struct device *dev)
		ec->ops = &ecard_default_ops;
		barrier();
		ec->irq_data = NULL;

		return 0;
		}

		/*

arch/arm/mach-tegra/board-paz00.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = {

		void __init tegra_paz00_wifikill_init(void)
		{
		platform_device_add_properties(&wifi_rfkill_device, wifi_rfkill_prop);
		device_create_managed_software_node(&wifi_rfkill_device.dev, wifi_rfkill_prop, NULL);
		gpiod_add_lookup_table(&wifi_gpio_lookup);
		platform_device_register(&wifi_rfkill_device);
		}