From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Apr 2023 19:07:50 +0000 (-0700)
Subject: Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v6.4-rc1~114
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cec24b8b6bb841a19b5c5555b600a511a8988100;p=linux-block.git

Merge tag 'char-misc-6.4-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc drivers updates from Greg KH:
 "Here is the "big" set of char/misc and other driver subsystems for
  6.4-rc1.

  It's pretty big, but due to the removal of pcmcia drivers, almost
  breaks even for number of lines added vs. removed, a nice change.

  Included in here are:

   - removal of unused PCMCIA drivers (finally!)

   - Interconnect driver updates and additions

   - Lots of IIO driver updates and additions

   - MHI driver updates

   - Coresight driver updates

   - NVMEM driver updates, which required some OF updates

   - W1 driver updates and a new maintainer to manage the subsystem

   - FPGA driver updates

   - New driver subsystem, CDX, for AMD systems

   - lots of other small driver updates and additions

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (196 commits)
  mcb-lpc: Reallocate memory region to avoid memory overlapping
  mcb-pci: Reallocate memory region to avoid memory overlapping
  mcb: Return actual parsed size when reading chameleon table
  kernel/configs: Drop Android config fragments
  virt: acrn: Replace obsolete memalign() with posix_memalign()
  spmi: Add a check for remove callback when removing a SPMI driver
  spmi: fix W=1 kernel-doc warnings
  spmi: mtk-pmif: Drop of_match_ptr for ID table
  spmi: pmic-arb: Convert to platform remove callback returning void
  spmi: mtk-pmif: Convert to platform remove callback returning void
  spmi: hisi-spmi-controller: Convert to platform remove callback returning void
  w1: gpio: remove unnecessary ENOMEM messages
  w1: omap-hdq: remove unnecessary ENOMEM messages
  w1: omap-hdq: add SPDX tag
  w1: omap-hdq: allow compile testing
  w1: matrox: remove unnecessary ENOMEM messages
  w1: matrox: use inline over __inline__
  w1: matrox: switch from asm to linux header
  w1: ds2482: do not use assignment in if condition
  w1: ds2482: drop unnecessary header
  ...
---

cec24b8b6bb841a19b5c5555b600a511a8988100
diff --cc drivers/of/Makefile
index 10f704592561,ae9923fd2940..eff624854575
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  # SPDX-License-Identifier: GPL-2.0
- obj-y = base.o cpu.o device.o platform.o property.o
 -obj-y = base.o device.o module.o platform.o property.o
++obj-y = base.o cpu.o device.o module.o platform.o property.o
  obj-$(CONFIG_OF_KOBJ) += kobj.o
  obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
  obj-$(CONFIG_OF_FLATTREE) += fdt.o
diff --cc include/linux/of.h
index bc2eb39dcf75,9b7a99499ef3..6ecde0515677
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -370,8 -373,8 +370,9 @@@ extern int of_n_addr_cells(struct devic
  extern int of_n_size_cells(struct device_node *np);
  extern const struct of_device_id *of_match_node(
  	const struct of_device_id *matches, const struct device_node *node);
 +extern const void *of_device_get_match_data(const struct device *dev);
- extern int of_modalias_node(struct device_node *node, char *modalias, int len);
+ extern int of_alias_from_compatible(const struct device_node *node, char *alias,
+ 				    int len);
  extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);
  extern int __of_parse_phandle_with_args(const struct device_node *np,
  	const char *list_name, const char *cells_name, int cell_count,
diff --cc include/linux/of_device.h
index 33f0ca348a62,ce20d8b00b3e..2c7a3d4bc775
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@@ -26,8 -26,13 +26,7 @@@ static inline int of_driver_match_devic
  	return of_match_device(drv->of_match_table, dev) != NULL;
  }
  
 -extern int of_device_add(struct platform_device *pdev);
 -extern int of_device_register(struct platform_device *ofdev);
 -extern void of_device_unregister(struct platform_device *ofdev);
 -
 -extern const void *of_device_get_match_data(const struct device *dev);
 -
  extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len);
- extern int of_device_request_module(struct device *dev);
  
  extern void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env);
  extern int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env);