From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Sep 2021 15:44:42 +0000 (-0700)
Subject: Merge tag 'driver-core-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v5.16~156
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=c6c3c5704ba70820f6b632982abde06661b7222a

Merge tag 'driver-core-5.15-rc1' of git://git./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
  ...
---

c6c3c5704ba70820f6b632982abde06661b7222a
diff --cc drivers/pci/pci-sysfs.c
index 7bbf2673c7f2,f65382915f01..b70f61fbcd4b
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@@ -978,7 -978,7 +978,7 @@@ void pci_create_legacy_files(struct pci
  	b->legacy_mem->size = 1024*1024;
  	b->legacy_mem->attr.mode = 0600;
  	b->legacy_mem->mmap = pci_mmap_legacy_mem;
- 	b->legacy_mem->mapping = iomem_get_mapping();
 -	b->legacy_io->f_mapping = iomem_get_mapping;
++	b->legacy_mem->f_mapping = iomem_get_mapping;
  	pci_adjust_legacy_attr(b, pci_mmap_mem);
  	error = device_create_bin_file(&b->dev, b->legacy_mem);
  	if (error)
diff --cc drivers/s390/crypto/ap_bus.c
index 439c1f6d2866,0992edcaf1af..f433428057d9
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@@ -890,10 -901,10 +890,10 @@@ out
  	return rc;
  }
  
- static int ap_device_remove(struct device *dev)
+ static void ap_device_remove(struct device *dev)
  {
  	struct ap_device *ap_dev = to_ap_dev(dev);
 -	struct ap_driver *ap_drv = ap_dev->drv;
 +	struct ap_driver *ap_drv = to_ap_drv(dev->driver);
  
  	/* prepare ap queue device removal */
  	if (is_queue_dev(dev))
@@@ -912,10 -923,9 +912,8 @@@
  	if (is_queue_dev(dev))
  		hash_del(&to_ap_queue(dev)->hnode);
  	spin_unlock_bh(&ap_queues_lock);
 -	ap_dev->drv = NULL;
  
  	put_device(dev);
- 
- 	return 0;
  }
  
  struct ap_queue *ap_get_qdev(ap_qid_t qid)