All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 00/17] mod_devicetable.h: Split into per subsystem headers
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  0 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman, Mark Brown
  Cc: Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	Raag Jadav, Sohil Mehta, Dave Hansen, Rob Herring,
	Saravana Kannan, Bjorn Helgaas, Rafael J. Wysocki, Len Brown,
	Andi Shyti, linux-kernel, Yemike Abhilash Chandra,
	Mauro Carvalho Chehab, linux-media, Nicolas Frattaroli,
	Liam Girdwood, Jaroslav Kysela, Takashi Iwai, Heiko Stuebner,
	linux-rockchip, linux-sound, linux-arm-kernel, Danilo Krummrich,
	driver-core, Jonathan Cameron, Dmitry Torokhov,
	Bartosz Golaszewski, Pei Xiao, Shashank Balaji, Ben Horgan,
	Johan Hovold, linux-usb, Nikita Kravets, Hans de Goede,
	Ilpo Järvinen, platform-driver-x86, devicetree, linux-i2c,
	Daniel Scally, Sakari Ailus, Minas Harutyunyan, Tianrui Zhao,
	Bibo Mao, Huacai Chen, WANG Xuerui, kvm, loongarch

Hello,

this is v2 of
https://lore.kernel.org/lkml/20260622210733.1743063-2-u.kleine-koenig@baylibre.com
which only consisted of the patch that is the first in this series.
Changes to this first patch are mostly cosmetic (whitespace cleanups)
and I renamed tee.h to tee_client.h to match tee_client_device_id.

The following 14 patches are preparations for patch #16 that replaces
the include of <linux/mod_devicetable.h> in several key header files by
a subset of the split headers that are needed for these. As there are
some drivers that rely on e.g. <linux/i2c.h> pulling in the definition
for usb_device_id, these must be prepared before <linux/i2c.h> stops
providing this definition.

patch #17 adapts various .c files to stop including
<linux/mod_devicetable.h>. These are easier as the device_ids that have
to be provided are only those used in that .c file. This last patch was
created by the Python script below. That also checks if the needed
headers are present for the files that don't explicitly include
<linux/mod_devicetable.h>. There are 131 files where the script was
unable to prove the includes to be sufficient. Most of them are covered
by build testing, the few remaining ones (12 .c files, 36 headers) were
checked semi-manually.

This series was compile tested for alpha, arc, arm64, loongarch, m68k,
mips, powerpc, riscv, s390, sh, sparc, and x86_64 using an allmodconfig
configuration. 

There are a few remaining usages of <linux/mod_devicetable.h>, I plan to
tackle them for the next merge window. These also shouldn't affect so
many files any more and so these changes will annoy less (i.e. result in
less recompilation during bisection and/or development).

Preparing this series took me longer than I hoped, so it's too late to
get it into next before -rc1. I will push this series to

	https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git device-id-rework

Given that there are a few merge conflicts with what is in Linus's tree
in the meantime, my plan is to rebase this branch to v7.2-rc1, retest
and then hopefully consider it ready for v7.2-rc2 after cooking in next
for a few days. This has the advantage that hardly any new conflicts
should get introduced in Linus's tree then.

Sounds like a sensible plan?

@Mark: I hope to have the rebase ready before you start working on
next-20260629. If not, just drop this branch from your list for this
day.

Best regards
Uwe

------->8--------
#!/usr/bin/env python3

import re
import os

# Maps a struct name to a set of headers that are enough to provide that struct.
symbol_header_map = {
        'acpi_device_id': (
            'linux/mod_device_id/acpi.h',
            'linux/acpi.h',                         # includes <linux/mod_devicetable.h>
            'linux/i2c.h',                          # includes <linux/acpi.h>
            'linux/device.h',                       # includes <linux/device/driver.h> which includes linux/mod_device_id/acpi.h
            'linux/spi/spi.h',                      # includes <linux/device.h>
            'linux/backlight.h',                    # includes <linux/device.h>
            'linux/pci.h',                          # includes <linux/device.h>
            'linux/platform_device.h',              # includes <linux/device.h>
            'linux/auxiliary_bus.h',                # includes <linux/device.h>
            'sound/soc.h',                          # includes <linux/platform_device.h>
            'sound/sof.h',                          # includes <linux/device.h>
            ),
        'amba_id': (
            'linux/mod_device_id/amba.h',
            'linux/amba/bus.h',                     # includes <linux/mod_devicetable.h>
            ),
        'ap_device_id': (
            'linux/mod_device_id/ap.h',
            ),
        'apr_device_id': (
            'linux/mod_device_id/apr.h',
            'linux/soc/qcom/apr.h',                 # includes <linux/mod_devicetable.h>
            ),
        'auxiliary_device_id': (
            'linux/mod_device_id/auxiliary.h',
            'linux/auxiliary_bus.h',                # includes <linux/mod_devicetable.h>
            'linux/misc/keba.h',                    # includes <linux/auxiliary_bus.h>
            'linux/mlx4/driver.h',                  # includes <linux/auxiliary_bus.h>
            'linux/soc/cirrus/ep93xx.h',            # includes <linux/auxiliary_bus.h>
            ),
        'bcma_device_id': (
            'linux/mod_device_id/bcma.h',
            'linux/bcma/bcma.h',                    # includes <linux/mod_devicetable.h>
            ),
        'ccw_device_id': (
            'linux/mod_device_id/ccw.h',
            'asm/ccwdev.h',                         # includes <linux/mod_devicetable.h>
            ),
        'cdx_device_id': (
            'linux/mod_device_id/cdx.h',
            'linux/cdx/cdx_bus.h',                  # includes <linux/mod_devicetable.h>
            ),
        'coreboot_device_id': (
            'linux/mod_device_id/coreboot.h',
            ),
        'css_device_id': (
            'linux/mod_device_id/css.h',
            'css.h',
            ),
        'dfl_device_id': (
            'linux/mod_device_id/dfl.h',
            'linux/dfl.h',                          # includes <linux/mod_devicetable.h>
            ),
        'dmi_(device|system)_id': (
            'linux/mod_device_id/dmi.h',
            'linux/dmi.h',                          # includes <linux/mod_devicetable.h>
            ),
        'eisa_device_id': (
            'linux/mod_device_id/eisa.h',
            'linux/eisa.h',                         # includes <linux/mod_devicetable.h>
            ),
        'fsl_mc_device_id': (
            'linux/mod_device_id/fsl_mc.h',
            'linux/fsl/mc.h',                       # includes <linux/mod_devicetable.h>
            ),
        'hda_device_id': (
            'linux/mod_device_id/hda.h',
            'sound/hda_codec.h',                    # includes <linux/mod_devicetable.h>
            ),
        'hid_device_id': (
            'linux/mod_device_id/hid.h',
            'linux/hid.h',                          # includes <linux/mod_devicetable.h>
            'linux/hidraw.h',                       # includes <linux/hid.h> transitively
            ),
        'hv_vmbus_device_id': (
            'linux/mod_device_id/hv_vmbus.h',
            'linux/hyperv.h',                       # includes linux/mod_devicetable.h>
            'hyperv_net.h',                         # includes linux/hyperv.h
            ),
        'i2c_device_id': (
            'linux/mod_device_id/i2c.h',
            'linux/i2c.h',                          # includes <linux/mod_devicetable.h>
            'linux/mfd/lp873x.h',                   # includes <linux/i2c.h>
            'media/dvb_frontend.h',                 # includes <linux/i2c.h>
            ),
        'i3c_device_id': (
            'linux/mod_device_id/i3c.h',
            'linux/i3c/device.h',                   # includes <linux/mod_devicetable.h>
            'linux/i3c/master.h',                   # includes <linux/i3c/device.h>
            ),
        'ieee1394_device_id': (
            'linux/mod_device_id/ieee1394.h',
            'linux/firewire.h',                     # should include <linux/mod_device_id/ieee1394.h>, instead of fwd decl
            ),
        'input_device_id': (
            'linux/mod_device_id/input.h',
            'linux/input.h',                        # includes <linux/mod_devicetable.h>
            ),
        'ipack_device_id': (
            'linux/mod_device_id/ipack.h',
            'linux/ipack.h',                        # includes <linux/mod_devicetable.h>
            ),
        'isapnp_device_id': (
            'linux/mod_device_id/isapnp.h',
            'linux/isapnp.h',                       # includes <linux/mod_devicetable.h>
            ),
        'ishtp_device_id': (
            'linux/mod_device_id/ishtp.h',
            'linux/intel-ish-client-if.h',          # includes <linux/mod_devicetable.h>
            ),
        'mcb_device_id': (
            'linux/mod_device_id/mcb.h',
            'linux/mcb.h',                          # includes <linux/mod_devicetable.h>
            ),
        'mdio_device_id': (
            'linux/mod_device_id/mdio.h',
            'linux/phy.h',                          # includes <linux/mod_devicetable.h>
            ),
        'mei_cl_device_id': (
            'linux/mod_device_id/mei_cl.h',
            'linux/mei_cl_bus.h',                   # includes <linux/mod_devicetable.h>
            ),
        'mhi_device_id': (
            'linux/mod_device_id/mhi.h',
            'linux/mhi.h',                          # should include <linux/mod_device_id/mhi.h>
            ),
        'mips_cdmm_device_id': (
            'linux/mod_device_id/mips_cdmm.h',
            'asm/cdmm.h',                           # arch/mips/include/asm/cdmm.h includes mod_devicetable.h
            ),
        'of_device_id': (
            'linux/mod_device_id/of.h',
            'linux/of.h',                           # includes <linux/mod_devicetable.h>
            'linux/of_address.h',                   # includes <linux/of.h>
            'linux/of_platform.h',                  # includes <linux/mod_devicetable.h>
            'linux/device/driver.h',                # includes <linux/mod_device_id/of.h>
            'linux/device.h',                       # includes <linux/device/driver.h>
            'linux/acpi.h',                         # includes <linux/device.h>
            'linux/backlight.h',                    # includes <linux/device.h>
            'linux/moxtet.h',                       # includes <linux/device.h>
            'linux/greybus.h',                      # includes <linux/device.h>
            'linux/platform_device.h',              # includes <linux/device.h>
            'linux/powercap.h',                     # includes <linux/device.h>
            'linux/auxiliary_bus.h',                # includes <linux/device.h>
            'linux/i2c.h',                          # includes <linux/of.h>
            'linux/reset.h',                        # includes <linux/of.h>
            'linux/spi/spi.h',                      # includes <linux/device.h>
            'asm/machine.h',                        # arch/mips/include/asm/machine.h includes <linux/of.h>
            'asm/macio.h',                          # arch/powerpc/include/asm/macio.h includes <linux/of.h>
            'sound/soc.h',                          # includes <linux/platform_device.h>
            'sound/dmaengine_pcm.h',                # includes <sound/soc.h>
            'linux/pm_qos.h',                       # includes <linux/device.h>
            'linux/clk-provider.h',                 # includes <linux/of.h>
            ),
        'parisc_device_id': (
            'linux/mod_device_id/parisc.h',
            'asm/parisc-device.h',                  # should include <linux/mod_device_id/parisc.h>
            'asm/hardware.h',                       # includes <linux/mod_devicetable.h>
            ),
        'pci_device_id': (
            'linux/mod_device_id/pci.h',
            'linux/pci.h',                          # includes <linux/mod_devicetable.h>
            'linux/comedi/comedi_pci.h',            # includes <linux/pci.h>
            'sound/hdaudio.h',                      # includes <linux/pci.h>
            'sound/hdaudio_ext.h',                  # includes <sound/hdaudio.h>
            ),
        'pci_epf_device_id': (
            'linux/mod_device_id/pci.h',
            'linux/pci-epf.h',                      # includes <linux/mod_devicetable.h>
            ),
        'pcmcia_device_id': (
            'linux/mod_device_id/pcmcia.h',
            'pcmcia/ds.h',                          # includes <linux/mod_devicetable.h>
            'linux/comedi/comedi_pcmcia.h',         # includes <pcmcia/ds.h>
            ),
        'platform_device_id': (
            'linux/mod_device_id/platform.h',
            'linux/platform_device.h',              # includes <linux/mod_device_id/platform.h>
            'linux/mfd/core.h',                     # includes <linux/platform_device.h>
            'linux/ipmi_smi.h',                     # includes <linux/platform_device.h>
            'sound/soc.h',                          # includes <linux/platform_device.h>
            'sound/dmaengine_pcm.h',                # includes <sound/soc.h>
            ),
        'pnp_(card_)?device_id': (
            'linux/mod_device_id/pnp.h',
            'linux/pnp.h',                          # includes <linux/mod_devicetable.h>
            'linux/isapnp.h',                       # includes <linux/pnp.h>
            ),
        'rio_device_id': (
            'linux/mod_device_id/rio.h',
            'linux/rio.h',                          # includes <linux/mod_devicetable.h>
            ),
        'rpmsg_device_id': (
            'linux/mod_device_id/rpmsg.h',
            'linux/rpmsg.h',                        # includes <linux/mod_devicetable.h>
            ),
        'sdio_device_id': (
            'linux/mod_device_id/sdio.h',
            'linux/mmc/sdio_func.h',                # includes <linux/mod_devicetable.h>
            ),
        'sdw_device_id': (
            'linux/mod_device_id/sdw.h',
            'linux/soundwire/sdw.h',                # includes <linux/mod_devicetable.h>
            ),
        'serio_device_id': (
            'linux/mod_device_id/serio.h',
            'linux/serio.h',                        # includes <linux/mod_devicetable.h>
            'linux/hil_mlc.h',                      # includes <linux/serio.h>
            ),
        'slim_device_id': (
            'linux/mod_device_id/slim.h',
            'linux/slimbus.h',                      # includes <linux/mod_devicetable.h>
            ),
        'spi_device_id': (
            'linux/mod_device_id/spi.h',
            'linux/spi/spi.h',                      # includes <linux/mod_devicetable.h>
            ),
        'spmi_device_id': (
            'linux/mod_device_id/spmi.h',
            ),
        'ssam_device_id': (
            'linux/mod_device_id/ssam.h',
            'linux/surface_aggregator/device.h',    # includes <linux/mod_devicetable.h>
            ),
        'ssb_device_id': (
            'linux/mod_device_id/ssb.h',
            'linux/ssb/ssb.h',                      # includes <linux/mod_devicetable.h>
            ),
        'tb_service_id': (
            'linux/mod_device_id/tb.h',
            'linux/thunderbolt.h',                  # includes <linux/mod_devicetable.h>
            'tb.h',                                 # drivers/thunderbolt/tb.h includes <linux/thunderbolt.h>
            ),
        'tee_client_device_id': (
            'linux/mod_device_id/tee_client.h',
            'linux/tee_drv.h',                      # includes <linux/mod_devicetable.h>
            'linux/tee_core.h',                     # includes <linux/tee_drv.h>
            ),
        'typec_device_id': (
            'linux/mod_device_id/typec.h',
            'linux/usb/typec_altmode.h',            # includes <linux/mod_devicetable.h>
            'linux/usb/typec_dp.h',                 # includes <linux/usb/typec_altmode.h>
            ),
        'ulpi_device_id': (
            'linux/mod_device_id/ulpi.h',
            'linux/ulpi/driver.h',                  # includes <linux/mod_devicetable.h>
            ),
        'usb_device_id': (
            'linux/mod_device_id/usb.h',
            'linux/usb.h',                          # includes <linux/mod_devicetable.h>
            'linux/comedi/comedi_usb.h',            # includes <linux/usb.h>
            'linux/usb/input.h',                    # includes <linux/usb.h>
            ),
        'vchiq_device_id': (
            'linux/mod_device_id/vchiq.h',
            'linux/raspberrypi/vchiq_bus.h',        # includes <linux/mod_devicetable.h>
            ),
        'virtio_device_id': (
            'linux/mod_device_id/virtio.h',
            'linux/virtio.h',                       # includes <linux/mod_devicetable.h>
            'linux/virtio_config.h',                # includes <linux/virtio.h>
            'uapi/linux/virtio_pmem.h',             # includes <linux/virtio_config.h>
            ),
        'wmi_device_id': (
            'linux/mod_device_id/wmi.h',
            'linux/wmi.h',                          # includes <linux/mod_devicetable.h>
            ),
        'x86_(cpu|device)_id': (
            'linux/mod_device_id/x86_cpu.h',
            'linux/platform_data/x86/soc.h',        # includes <linux/mod_devicetable.h>
            'asm/cpu_device_id.h',                  # includes <linux/mod_devicetable.h>
            ),
        'zorro_device_id': (
            'linux/mod_device_id/zorro.h',
            'linux/zorro.h',                        # includes <linux/mod_devicetable.h>
            ),

        'cpu_feature': (
            'linux/mod_devicetable.h',
            'linux/cpufeature.h',                   # includes <linux/mod_devicetable.h>
            ),
    }

for dirpath, dirnames, filenames in os.walk('.'):
    for fn in (os.path.join(dirpath, f) for f in filenames if re.match(r'.*\.[ch]$', f)):
        if fn in ('./scripts/mod/devicetable-offsets.c', './scripts/mod/file2alias.c'):
            continue
        with open(fn) as f:
            try:
                filecontent = f.read()
            except Exception as e:
                print(f"Error { e } while reading { fn }")
                continue

        # If the file has an include of the legacy header, drop it
        if momdt := re.search(r'#[ \t]*include\s*[<"]linux/mod_devicetable.h[>"]([ \t]*/\*[^*]*\*/)?[ \t]*\n', filecontent):
            filecontent = filecontent[:momdt.start()] + filecontent[momdt.end():]

        for s, hs in symbol_header_map.items():
            if re.search(fr'\bstruct\s*{ s }\b\s*;', filecontent):
                # with a forward declaration assume we're fine (unsafe!)
                continue

            if re.search(fr'\bstruct\s*{ s }\b', filecontent):
                if fn.endswith(tuple('/' + h for h in hs)):
                    break

                # include local headers
                seenheaders = set()
                expanded_filecontent = filecontent
                while mo := re.search(r'#\s*include\s*"([^"]*)"', expanded_filecontent):
                    start, end = mo.span(0)
                    lhn = mo.group(1)
                    
                    if lhn in seenheaders:
                        expanded_filecontent = expanded_filecontent[:start] + expanded_filecontent[end:]
                    else:
                        seenheaders.add(lhn)
                        try:
                            with open(os.path.join(dirpath, lhn)) as lh:
                                lhcontent = lh.read()
                            expanded_filecontent = expanded_filecontent[:start] + lhcontent + expanded_filecontent[end:]
                        except Exception:
                            expanded_filecontent = expanded_filecontent[:start] + expanded_filecontent[end:]

                for h in hs:
                    if re.search(fr'#\s*include\s*[<"]{ h }[>"]', expanded_filecontent):
                        break
                else:
                    # only rewrite .c files, headers need more care
                    if momdt:
                        if fn.endswith('.c'):
                            filecontent = filecontent[:momdt.start()] + f'#include <{ hs[0] }>\n' + filecontent[momdt.start():]

                    else:
                        print(f"Header for { s } missing in { fn }")

        if momdt and fn.endswith('.c'):
            with open(fn, "w") as f:
                f.write(filecontent)
------->8--------


Uwe Kleine-König (The Capable Hub) (17):
  mod_devicetable.h: Split into per subsystem headers
  media: ti: vpe: #include <linux/platform_device.h> explicitly
  ASoC: rockchip: rockchip_sai: #include <linux/platform_device.h>
    explicitly
  driver: core: Include headers for acpi_device_id and of_device_id for
    struct device_driver
  driver core: platform: Include header for struct platform_device_id
  usb: serial: Include <linux/usb.h> in <linux/usb/serial.h>
  platform/x86: msi-ec: Ensure dmi_system_id is defined
  of: Explicitly include <linux/types.h> and <linux/err.h>
  i2c: Let i2c-core.h include <linux/i2c.h>
  platform/x86: x86-android-tablets: Add include defining struct
    dmi_system_id
  platform/x86: int3472: Add include defining struct dmi_system_id
  usb: dwc2: Add include defining struct pci_device_id
  ALSA: hda/core: Add include defining struct hda_device_id
  LoongArch: KVM: Add include defining struct cpu_feature
  media: em28xx: Add include for struct usb_device_id
  Replace <linux/mod_devicetable.h> by more specific
    <linux/mod_device_id/*.h> (headers)
  Replace <linux/mod_devicetable.h> by more specific
    <linux/mod_device_id/*.h> (c files)

 arch/arm/mach-omap2/board-generic.c           |    1 -
 arch/loongarch/kvm/main.c                     |    1 +
 arch/mips/include/asm/cdmm.h                  |    2 +-
 arch/mips/lantiq/xway/dcdc.c                  |    1 -
 arch/mips/lantiq/xway/gptu.c                  |    1 -
 arch/mips/lantiq/xway/vmmc.c                  |    1 -
 arch/mips/pci/pci-rt2880.c                    |    1 -
 arch/mips/ralink/timer.c                      |    1 -
 arch/parisc/include/asm/hardware.h            |    4 +-
 arch/parisc/include/asm/parisc-device.h       |    1 +
 .../powerpc/platforms/83xx/mcu_mpc8349emitx.c |    1 -
 arch/powerpc/platforms/86xx/common.c          |    1 -
 arch/powerpc/sysdev/fsl_lbc.c                 |    1 -
 arch/powerpc/sysdev/fsl_pmc.c                 |    1 -
 arch/s390/include/asm/ccwdev.h                |    2 +-
 arch/sh/drivers/platform_early.c              |    2 +-
 arch/sparc/crypto/crop_devid.c                |    2 +-
 arch/sparc/kernel/of_device_32.c              |    1 -
 arch/sparc/kernel/of_device_64.c              |    1 -
 arch/sparc/kernel/of_device_common.c          |    1 -
 arch/x86/include/asm/cpu_device_id.h          |    5 +-
 arch/x86/kvm/svm/svm.c                        |    1 -
 arch/x86/kvm/vmx/vmx.c                        |    1 -
 drivers/accel/ethosu/ethosu_drv.c             |    1 -
 drivers/accel/qaic/qaic_timesync.c            |    1 -
 drivers/accel/qaic/sahara.c                   |    1 -
 drivers/ata/ahci_platform.c                   |    1 -
 drivers/ata/ahci_sunxi.c                      |    1 -
 drivers/ata/pata_buddha.c                     |    1 -
 drivers/ata/pata_ep93xx.c                     |    1 -
 drivers/ata/pata_imx.c                        |    1 -
 drivers/auxdisplay/arm-charlcd.c              |    1 -
 drivers/auxdisplay/hd44780.c                  |    1 -
 drivers/auxdisplay/lcd2s.c                    |    1 -
 drivers/auxdisplay/max6959.c                  |    1 -
 drivers/auxdisplay/seg-led-gpio.c             |    1 -
 drivers/block/floppy.c                        |    2 +-
 drivers/bluetooth/hci_h5.c                    |    1 -
 drivers/bluetooth/hci_qca.c                   |    1 -
 drivers/bus/mhi/ep/main.c                     |    1 -
 drivers/bus/mhi/host/init.c                   |    1 -
 drivers/cache/hisi_soc_hha.c                  |    1 -
 drivers/cdx/controller/cdx_controller.c       |    1 -
 drivers/char/hw_random/airoha-trng.c          |    1 -
 drivers/char/hw_random/atmel-rng.c            |    1 -
 drivers/char/hw_random/ba431-rng.c            |    1 -
 drivers/char/hw_random/bcm74110-rng.c         |    1 -
 drivers/char/hw_random/exynos-trng.c          |    1 -
 drivers/char/hw_random/histb-rng.c            |    1 -
 drivers/char/hw_random/imx-rngc.c             |    1 -
 drivers/char/hw_random/ingenic-trng.c         |    1 -
 drivers/char/hw_random/iproc-rng200.c         |    1 -
 drivers/char/hw_random/pasemi-rng.c           |    1 -
 drivers/char/hw_random/pic32-rng.c            |    1 -
 drivers/char/hw_random/powernv-rng.c          |    1 -
 drivers/char/hw_random/xgene-rng.c            |    1 -
 drivers/char/hw_random/xilinx-trng.c          |    1 -
 drivers/char/hw_random/xiphera-trng.c         |    1 -
 drivers/clk/aspeed/clk-ast2600.c              |    1 -
 drivers/clk/aspeed/clk-ast2700.c              |    1 -
 drivers/clk/clk-axi-clkgen.c                  |    1 -
 drivers/clk/clk-bm1880.c                      |    1 -
 drivers/clk/clk-cdce706.c                     |    1 -
 drivers/clk/clk-eyeq.c                        |    1 -
 drivers/clk/clk-renesas-pcie.c                |    1 -
 drivers/clk/clk-si521xx.c                     |    1 -
 drivers/clk/clk-versaclock5.c                 |    1 -
 drivers/clk/imx/clk-imx8mp-audiomix.c         |    1 -
 drivers/clk/mediatek/clk-mt2701-g3d.c         |    1 -
 drivers/clk/mediatek/clk-mt2701.c             |    1 -
 drivers/clk/mediatek/clk-mt2712.c             |    1 -
 drivers/clk/mediatek/clk-mt6765.c             |    1 -
 drivers/clk/mediatek/clk-mt6779-aud.c         |    1 -
 drivers/clk/mediatek/clk-mt7622-eth.c         |    1 -
 drivers/clk/mediatek/clk-mt7622-hif.c         |    1 -
 drivers/clk/mediatek/clk-mt7622.c             |    1 -
 drivers/clk/mediatek/clk-mt7629-hif.c         |    1 -
 drivers/clk/mediatek/clk-mt7981-apmixed.c     |    1 -
 drivers/clk/mediatek/clk-mt7981-eth.c         |    1 -
 drivers/clk/mediatek/clk-mt7981-infracfg.c    |    1 -
 drivers/clk/mediatek/clk-mt7981-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt7986-apmixed.c     |    1 -
 drivers/clk/mediatek/clk-mt7986-eth.c         |    1 -
 drivers/clk/mediatek/clk-mt7986-infracfg.c    |    1 -
 drivers/clk/mediatek/clk-mt7986-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt8167-aud.c         |    1 -
 drivers/clk/mediatek/clk-mt8167-img.c         |    1 -
 drivers/clk/mediatek/clk-mt8167-mfgcfg.c      |    1 -
 drivers/clk/mediatek/clk-mt8167-mm.c          |    1 -
 drivers/clk/mediatek/clk-mt8167-vdec.c        |    1 -
 drivers/clk/mediatek/clk-mt8173-mm.c          |    1 -
 drivers/clk/mediatek/clk-mt8183.c             |    1 -
 .../clk/mediatek/clk-mt8188-adsp_audio26m.c   |    1 -
 drivers/clk/mediatek/clk-mt8188-apmixedsys.c  |    1 -
 .../clk/mediatek/clk-mt8188-imp_iic_wrap.c    |    1 -
 drivers/clk/mediatek/clk-mt8188-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt8188-vdo0.c        |    1 -
 drivers/clk/mediatek/clk-mt8188-vdo1.c        |    1 -
 drivers/clk/mediatek/clk-mt8188-venc.c        |    1 -
 drivers/clk/mediatek/clk-mt8188-wpe.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-cam.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-img.c         |    1 -
 .../clk/mediatek/clk-mt8192-imp_iic_wrap.c    |    1 -
 drivers/clk/mediatek/clk-mt8192-ipe.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-mdp.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-mfg.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-msdc.c        |    1 -
 drivers/clk/mediatek/clk-mt8192-scp_adsp.c    |    1 -
 drivers/clk/mediatek/clk-mt8192-vdec.c        |    1 -
 drivers/clk/mediatek/clk-mt8192-venc.c        |    1 -
 drivers/clk/mediatek/clk-mt8192.c             |    1 -
 drivers/clk/mediatek/clk-mt8195-apmixedsys.c  |    1 -
 drivers/clk/mediatek/clk-mt8195-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt8365.c             |    1 -
 drivers/clk/mediatek/clk-mt8516-aud.c         |    1 -
 drivers/clk/meson/a1-peripherals.c            |    1 -
 drivers/clk/meson/a1-pll.c                    |    1 -
 drivers/clk/meson/axg.c                       |    1 -
 drivers/clk/meson/gxbb.c                      |    1 -
 drivers/clk/qcom/cambistmclkcc-kaanapali.c    |    1 -
 drivers/clk/qcom/cambistmclkcc-sm8750.c       |    1 -
 drivers/clk/qcom/camcc-kaanapali.c            |    1 -
 drivers/clk/qcom/camcc-milos.c                |    1 -
 drivers/clk/qcom/camcc-qcs615.c               |    1 -
 drivers/clk/qcom/camcc-sa8775p.c              |    1 -
 drivers/clk/qcom/camcc-sc7180.c               |    1 -
 drivers/clk/qcom/camcc-sc7280.c               |    1 -
 drivers/clk/qcom/camcc-sc8180x.c              |    1 -
 drivers/clk/qcom/camcc-sc8280xp.c             |    1 -
 drivers/clk/qcom/camcc-sdm845.c               |    1 -
 drivers/clk/qcom/camcc-sm4450.c               |    1 -
 drivers/clk/qcom/camcc-sm6350.c               |    1 -
 drivers/clk/qcom/camcc-sm7150.c               |    1 -
 drivers/clk/qcom/camcc-sm8150.c               |    1 -
 drivers/clk/qcom/camcc-sm8250.c               |    1 -
 drivers/clk/qcom/camcc-sm8450.c               |    1 -
 drivers/clk/qcom/camcc-sm8550.c               |    1 -
 drivers/clk/qcom/camcc-sm8650.c               |    1 -
 drivers/clk/qcom/camcc-sm8750.c               |    1 -
 drivers/clk/qcom/camcc-x1e80100.c             |    1 -
 drivers/clk/qcom/dispcc-eliza.c               |    1 -
 drivers/clk/qcom/dispcc-glymur.c              |    1 -
 drivers/clk/qcom/dispcc-kaanapali.c           |    1 -
 drivers/clk/qcom/dispcc-milos.c               |    1 -
 drivers/clk/qcom/dispcc-qcm2290.c             |    1 -
 drivers/clk/qcom/dispcc-qcs615.c              |    1 -
 drivers/clk/qcom/dispcc-sc7180.c              |    1 -
 drivers/clk/qcom/dispcc-sc7280.c              |    1 -
 drivers/clk/qcom/dispcc-sc8280xp.c            |    1 -
 drivers/clk/qcom/dispcc-sdm845.c              |    1 -
 drivers/clk/qcom/dispcc-sm4450.c              |    1 -
 drivers/clk/qcom/dispcc-sm6115.c              |    1 -
 drivers/clk/qcom/dispcc-sm6125.c              |    1 -
 drivers/clk/qcom/dispcc-sm6350.c              |    1 -
 drivers/clk/qcom/dispcc-sm6375.c              |    1 -
 drivers/clk/qcom/dispcc-sm7150.c              |    1 -
 drivers/clk/qcom/dispcc-sm8250.c              |    1 -
 drivers/clk/qcom/dispcc-sm8450.c              |    1 -
 drivers/clk/qcom/dispcc-sm8550.c              |    1 -
 drivers/clk/qcom/dispcc-sm8750.c              |    1 -
 drivers/clk/qcom/dispcc-x1e80100.c            |    1 -
 drivers/clk/qcom/dispcc0-sa8775p.c            |    1 -
 drivers/clk/qcom/dispcc1-sa8775p.c            |    1 -
 drivers/clk/qcom/ecpricc-qdu1000.c            |    1 -
 drivers/clk/qcom/gcc-eliza.c                  |    1 -
 drivers/clk/qcom/gcc-glymur.c                 |    1 -
 drivers/clk/qcom/gcc-ipq5018.c                |    1 -
 drivers/clk/qcom/gcc-ipq5332.c                |    1 -
 drivers/clk/qcom/gcc-kaanapali.c              |    1 -
 drivers/clk/qcom/gcc-milos.c                  |    1 -
 drivers/clk/qcom/gcc-nord.c                   |    1 -
 drivers/clk/qcom/gcc-qcs615.c                 |    1 -
 drivers/clk/qcom/gcc-qcs8300.c                |    1 -
 drivers/clk/qcom/gcc-sa8775p.c                |    1 -
 drivers/clk/qcom/gcc-sdx75.c                  |    1 -
 drivers/clk/qcom/gcc-sm4450.c                 |    1 -
 drivers/clk/qcom/gcc-sm7150.c                 |    1 -
 drivers/clk/qcom/gcc-sm8650.c                 |    1 -
 drivers/clk/qcom/gcc-sm8750.c                 |    1 -
 drivers/clk/qcom/gcc-x1e80100.c               |    1 -
 drivers/clk/qcom/gpucc-glymur.c               |    1 -
 drivers/clk/qcom/gpucc-kaanapali.c            |    1 -
 drivers/clk/qcom/gpucc-milos.c                |    1 -
 drivers/clk/qcom/gpucc-msm8998.c              |    1 -
 drivers/clk/qcom/gpucc-qcm2290.c              |    1 -
 drivers/clk/qcom/gpucc-qcs615.c               |    1 -
 drivers/clk/qcom/gpucc-sa8775p.c              |    1 -
 drivers/clk/qcom/gpucc-sar2130p.c             |    1 -
 drivers/clk/qcom/gpucc-sc7180.c               |    1 -
 drivers/clk/qcom/gpucc-sc7280.c               |    1 -
 drivers/clk/qcom/gpucc-sc8280xp.c             |    1 -
 drivers/clk/qcom/gpucc-sdm660.c               |    1 -
 drivers/clk/qcom/gpucc-sdm845.c               |    1 -
 drivers/clk/qcom/gpucc-sm4450.c               |    1 -
 drivers/clk/qcom/gpucc-sm6115.c               |    1 -
 drivers/clk/qcom/gpucc-sm6125.c               |    1 -
 drivers/clk/qcom/gpucc-sm6350.c               |    1 -
 drivers/clk/qcom/gpucc-sm6375.c               |    1 -
 drivers/clk/qcom/gpucc-sm8150.c               |    1 -
 drivers/clk/qcom/gpucc-sm8250.c               |    1 -
 drivers/clk/qcom/gpucc-sm8350.c               |    1 -
 drivers/clk/qcom/gpucc-sm8450.c               |    1 -
 drivers/clk/qcom/gpucc-sm8550.c               |    1 -
 drivers/clk/qcom/gpucc-sm8650.c               |    1 -
 drivers/clk/qcom/gpucc-sm8750.c               |    1 -
 drivers/clk/qcom/gpucc-x1e80100.c             |    1 -
 drivers/clk/qcom/gpucc-x1p42100.c             |    1 -
 drivers/clk/qcom/gxclkctl-kaanapali.c         |    1 -
 drivers/clk/qcom/ipq-cmn-pll.c                |    1 -
 drivers/clk/qcom/lpasscc-sc8280xp.c           |    1 -
 drivers/clk/qcom/lpasscc-sm6115.c             |    1 -
 drivers/clk/qcom/mmcc-apq8084.c               |    1 -
 drivers/clk/qcom/mmcc-msm8960.c               |    1 -
 drivers/clk/qcom/mmcc-msm8974.c               |    1 -
 drivers/clk/qcom/mmcc-msm8994.c               |    1 -
 drivers/clk/qcom/mmcc-msm8996.c               |    1 -
 drivers/clk/qcom/mmcc-msm8998.c               |    1 -
 drivers/clk/qcom/mmcc-sdm660.c                |    1 -
 drivers/clk/qcom/negcc-nord.c                 |    1 -
 drivers/clk/qcom/nwgcc-nord.c                 |    1 -
 drivers/clk/qcom/segcc-nord.c                 |    1 -
 drivers/clk/qcom/tcsrcc-eliza.c               |    1 -
 drivers/clk/qcom/tcsrcc-glymur.c              |    1 -
 drivers/clk/qcom/tcsrcc-nord.c                |    1 -
 drivers/clk/qcom/tcsrcc-sm8650.c              |    1 -
 drivers/clk/qcom/tcsrcc-sm8750.c              |    1 -
 drivers/clk/qcom/tcsrcc-x1e80100.c            |    1 -
 drivers/clk/qcom/videocc-glymur.c             |    1 -
 drivers/clk/qcom/videocc-kaanapali.c          |    1 -
 drivers/clk/qcom/videocc-milos.c              |    1 -
 drivers/clk/qcom/videocc-qcs615.c             |    1 -
 drivers/clk/qcom/videocc-sa8775p.c            |    1 -
 drivers/clk/qcom/videocc-sm7150.c             |    1 -
 drivers/clk/qcom/videocc-sm8450.c             |    1 -
 drivers/clk/qcom/videocc-sm8550.c             |    1 -
 drivers/clk/qcom/videocc-sm8750.c             |    1 -
 drivers/clk/renesas/clk-vbattb.c              |    1 -
 drivers/clk/renesas/renesas-cpg-mssr.c        |    1 -
 drivers/clk/renesas/rzg2l-cpg.c               |    1 -
 drivers/clk/renesas/rzv2h-cpg.c               |    1 -
 drivers/clk/samsung/clk-exynos-audss.c        |    1 -
 drivers/clk/samsung/clk-exynos-clkout.c       |    1 -
 drivers/clk/samsung/clk-exynos2200.c          |    1 -
 drivers/clk/samsung/clk-exynos3250.c          |    1 -
 drivers/clk/samsung/clk-exynos4.c             |    1 -
 drivers/clk/samsung/clk-exynos4412-isp.c      |    1 -
 drivers/clk/samsung/clk-exynos5-subcmu.c      |    1 -
 drivers/clk/samsung/clk-exynos5250.c          |    1 -
 drivers/clk/samsung/clk-exynos5420.c          |    1 -
 drivers/clk/samsung/clk-exynos5433.c          |    1 -
 drivers/clk/samsung/clk-exynos7870.c          |    1 -
 drivers/clk/samsung/clk-exynos7885.c          |    1 -
 drivers/clk/samsung/clk-exynos850.c           |    1 -
 drivers/clk/samsung/clk-exynos8895.c          |    1 -
 drivers/clk/samsung/clk-exynos990.c           |    1 -
 drivers/clk/samsung/clk-exynosautov9.c        |    1 -
 drivers/clk/samsung/clk-exynosautov920.c      |    1 -
 drivers/clk/samsung/clk-fsd.c                 |    1 -
 drivers/clk/samsung/clk-gs101.c               |    1 -
 drivers/clk/samsung/clk-s5pv210-audss.c       |    1 -
 drivers/clk/samsung/clk.c                     |    1 -
 drivers/clk/sprd/ums512-clk.c                 |    1 -
 .../clk/starfive/clk-starfive-jh7100-audio.c  |    1 -
 drivers/clk/starfive/clk-starfive-jh7100.c    |    1 -
 drivers/clk/tegra/clk-device.c                |    1 -
 drivers/clk/xilinx/xlnx_vcu.c                 |    1 -
 drivers/counter/interrupt-cnt.c               |    1 -
 drivers/counter/stm32-lptimer-cnt.c           |    1 -
 drivers/counter/stm32-timer-cnt.c             |    1 -
 drivers/counter/ti-ecap-capture.c             |    1 -
 drivers/counter/ti-eqep.c                     |    1 -
 drivers/cpufreq/amd_freq_sensitivity.c        |    1 -
 drivers/cpufreq/armada-37xx-cpufreq.c         |    1 -
 drivers/crypto/atmel-aes.c                    |    1 -
 drivers/crypto/atmel-sha.c                    |    1 -
 drivers/crypto/atmel-tdes.c                   |    1 -
 drivers/crypto/hifn_795x.c                    |    1 -
 drivers/crypto/img-hash.c                     |    1 -
 .../intel/keembay/keembay-ocs-hcu-core.c      |    1 -
 drivers/crypto/qce/core.c                     |    1 -
 drivers/crypto/starfive/jh7110-cryp.c         |    1 -
 drivers/crypto/talitos.c                      |    1 -
 drivers/crypto/tegra/tegra-se-main.c          |    1 -
 drivers/crypto/ti/dthev2-common.c             |    1 -
 drivers/crypto/xilinx/zynqmp-aes-gcm.c        |    1 -
 drivers/devfreq/hisi_uncore_freq.c            |    1 -
 drivers/devfreq/imx8m-ddrc.c                  |    1 -
 drivers/dma/amd/qdma/qdma.c                   |    1 -
 drivers/dma/ep93xx_dma.c                      |    1 -
 drivers/dma/qcom/hidma.c                      |    1 -
 drivers/dma/sf-pdma/sf-pdma.c                 |    1 -
 drivers/dma/xgene-dma.c                       |    1 -
 drivers/dma/xilinx/xdma.c                     |    1 -
 drivers/dpll/zl3073x/dpll.c                   |    1 -
 drivers/edac/fsl_ddr_edac.c                   |    1 -
 drivers/edac/mpc85xx_edac.c                   |    1 -
 drivers/edac/pnd2_edac.c                      |    1 -
 drivers/edac/sb_edac.c                        |    1 -
 drivers/extcon/extcon-intel-cht-wc.c          |    1 -
 drivers/extcon/extcon-intel-mrfld.c           |    1 -
 drivers/extcon/extcon-max14526.c              |    1 -
 drivers/extcon/extcon-max3355.c               |    1 -
 drivers/extcon/extcon-qcom-spmi-misc.c        |    1 -
 drivers/extcon/extcon-usb-gpio.c              |    1 -
 drivers/firewire/core-device.c                |    1 -
 drivers/firewire/net.c                        |    1 -
 drivers/firewire/sbp2.c                       |    1 -
 drivers/firmware/google/cbmem.c               |    2 +-
 drivers/firmware/google/coreboot_table.c      |    2 +-
 .../firmware/google/framebuffer-coreboot.c    |    2 +-
 drivers/firmware/google/memconsole-coreboot.c |    2 +-
 drivers/firmware/google/vpd.c                 |    2 +-
 drivers/firmware/qemu_fw_cfg.c                |    1 -
 drivers/fpga/altera-freeze-bridge.c           |    1 -
 drivers/fpga/altera-pr-ip-core-plat.c         |    1 -
 drivers/fpga/ice40-spi.c                      |    1 -
 drivers/fpga/intel-m10-bmc-sec-update.c       |    1 -
 drivers/fpga/xilinx-selectmap.c               |    1 -
 drivers/fpga/xilinx-spi.c                     |    1 -
 drivers/fsi/fsi-master-i2cr.c                 |    1 -
 drivers/fsi/fsi-scom.c                        |    2 +-
 drivers/fsi/i2cr-scom.c                       |    1 -
 drivers/gpib/eastwood/fluke_gpib.c            |    1 -
 drivers/gpio/gpio-74xx-mmio.c                 |    1 -
 drivers/gpio/gpio-adnp.c                      |    1 -
 drivers/gpio/gpio-aggregator.c                |    1 -
 drivers/gpio/gpio-altera-a10sr.c              |    2 +-
 drivers/gpio/gpio-altera.c                    |    1 -
 drivers/gpio/gpio-ath79.c                     |    1 -
 drivers/gpio/gpio-bcm-kona.c                  |    1 -
 drivers/gpio/gpio-by-pinctrl.c                |    1 -
 drivers/gpio/gpio-cros-ec.c                   |    1 -
 drivers/gpio/gpio-dwapb.c                     |    1 -
 drivers/gpio/gpio-en7523.c                    |    1 -
 drivers/gpio/gpio-ge.c                        |    1 -
 drivers/gpio/gpio-graniterapids.c             |    1 -
 drivers/gpio/gpio-hisi.c                      |    1 -
 drivers/gpio/gpio-idt3243x.c                  |    1 -
 drivers/gpio/gpio-latch.c                     |    1 -
 drivers/gpio/gpio-line-mux.c                  |    1 -
 drivers/gpio/gpio-ltc4283.c                   |    1 -
 drivers/gpio/gpio-max7360.c                   |    1 -
 drivers/gpio/gpio-max77759.c                  |    1 -
 drivers/gpio/gpio-mb86s7x.c                   |    1 -
 drivers/gpio/gpio-mlxbf2.c                    |    1 -
 drivers/gpio/gpio-mmio.c                      |    1 -
 drivers/gpio/gpio-mockup.c                    |    1 -
 drivers/gpio/gpio-mpc8xxx.c                   |    1 -
 drivers/gpio/gpio-mpfs.c                      |    1 -
 drivers/gpio/gpio-nomadik.c                   |    1 -
 drivers/gpio/gpio-pca953x.c                   |    1 -
 drivers/gpio/gpio-pcf857x.c                   |    1 -
 drivers/gpio/gpio-qixis-fpga.c                |    1 -
 drivers/gpio/gpio-realtek-otto.c              |    1 -
 drivers/gpio/gpio-shared-proxy.c              |    1 -
 drivers/gpio/gpio-sim.c                       |    1 -
 drivers/gpio/gpio-sl28cpld.c                  |    1 -
 drivers/gpio/gpio-sloppy-logic-analyzer.c     |    1 -
 drivers/gpio/gpio-sprd.c                      |    1 -
 drivers/gpio/gpio-tn48m.c                     |    1 -
 drivers/gpio/gpio-virtuser.c                  |    1 -
 drivers/gpio/gpio-wcd934x.c                   |    1 -
 drivers/gpio/gpio-xgene-sb.c                  |    1 -
 drivers/gpio/gpio-xra1403.c                   |    1 -
 drivers/gpio/gpio-zevio.c                     |    1 -
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c       |    1 -
 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c   |    1 -
 drivers/gpu/drm/bridge/inno-hdmi.c            |    1 -
 drivers/gpu/drm/bridge/ssd2825.c              |    1 -
 drivers/gpu/drm/bridge/tc358762.c             |    2 +-
 drivers/gpu/drm/bridge/tc358764.c             |    2 +-
 drivers/gpu/drm/bridge/th1520-dw-hdmi.c       |    1 -
 drivers/gpu/drm/drm_panel_backlight_quirks.c  |    1 -
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c         |    1 -
 drivers/gpu/drm/exynos/exynos_drm_gsc.c       |    1 -
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c  |    1 -
 drivers/gpu/drm/imagination/pvr_drv.c         |    1 -
 drivers/gpu/drm/imx/dc/dc-cf.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-de.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-drv.c               |    1 -
 drivers/gpu/drm/imx/dc/dc-ed.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-fg.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-fl.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-fw.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-lb.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-pe.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-tc.c                |    1 -
 drivers/gpu/drm/imx/lcdc/imx-lcdc.c           |    1 -
 drivers/gpu/drm/mediatek/mtk_cec.c            |    1 -
 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c       |    1 -
 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c     |    1 -
 drivers/gpu/drm/mxsfb/mxsfb_drv.c             |    1 -
 drivers/gpu/drm/panel/panel-arm-versatile.c   |    1 -
 drivers/gpu/drm/panel/panel-auo-a030jtn01.c   |    1 -
 drivers/gpu/drm/panel/panel-boe-td4320.c      |    2 +-
 .../gpu/drm/panel/panel-feixin-k101-im2ba02.c |    2 +-
 .../drm/panel/panel-feiyang-fy07024di26a30d.c |    2 +-
 drivers/gpu/drm/panel/panel-himax-hx83112b.c  |    1 -
 drivers/gpu/drm/panel/panel-himax-hx83121a.c  |    1 -
 drivers/gpu/drm/panel/panel-himax-hx8394.c    |    1 -
 drivers/gpu/drm/panel/panel-hydis-hv101hd1.c  |    2 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9341.c  |    1 -
 .../gpu/drm/panel/panel-ilitek-ili9806e-dsi.c |    1 -
 drivers/gpu/drm/panel/panel-lg-ld070wx3.c     |    2 +-
 drivers/gpu/drm/panel/panel-motorola-mot.c    |    2 +-
 drivers/gpu/drm/panel/panel-novatek-nt35532.c |    2 +-
 drivers/gpu/drm/panel/panel-novatek-nt37801.c |    1 -
 .../gpu/drm/panel/panel-orisetech-otm8009a.c  |    1 -
 drivers/gpu/drm/panel/panel-raydium-rm67200.c |    2 +-
 drivers/gpu/drm/panel/panel-raydium-rm68200.c |    2 +-
 drivers/gpu/drm/panel/panel-renesas-r61307.c  |    2 +-
 drivers/gpu/drm/panel/panel-renesas-r69328.c  |    2 +-
 .../gpu/drm/panel/panel-samsung-ltl106hl02.c  |    2 +-
 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c |    2 +-
 .../gpu/drm/panel/panel-samsung-s6e63j0x03.c  |    1 -
 .../gpu/drm/panel/panel-samsung-s6e63m0-dsi.c |    2 +-
 .../panel/panel-samsung-s6e88a0-ams427ap24.c  |    1 -
 .../drm/panel/panel-samsung-s6e8fc0-m1906f9.c |    1 -
 drivers/gpu/drm/panel/panel-sitronix-st7703.c |    1 -
 drivers/gpu/drm/panel/panel-summit.c          |    1 -
 .../gpu/drm/panel/panel-visionox-rm69299.c    |    1 -
 .../gpu/drm/panel/panel-visionox-rm692e5.c    |    1 -
 .../gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c    |    1 -
 .../gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c  |    1 -
 drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c |    1 -
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |    1 -
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c   |    1 -
 drivers/gpu/drm/sprd/sprd_drm.c               |    1 -
 drivers/gpu/drm/sti/sti_hda.c                 |    1 -
 drivers/gpu/drm/stm/drv.c                     |    1 -
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c         |    1 -
 drivers/gpu/drm/sun4i/sun6i_drc.c             |    1 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c           |    1 -
 drivers/gpu/drm/tiny/sharp-memory.c           |    1 -
 drivers/gpu/drm/vc4/vc4_dpi.c                 |    1 -
 drivers/gpu/drm/vc4/vc4_txp.c                 |    1 -
 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c      |    1 -
 drivers/hid/intel-ish-hid/ishtp/bus.h         |    2 +-
 drivers/hsi/controllers/omap_ssi_port.c       |    1 -
 drivers/hte/hte-tegra194-test.c               |    1 -
 drivers/hwmon/adcxx.c                         |    1 -
 drivers/hwmon/adt7410.c                       |    1 -
 drivers/hwmon/adt7462.c                       |    1 -
 drivers/hwmon/adt7475.c                       |    1 -
 drivers/hwmon/as370-hwmon.c                   |    1 -
 drivers/hwmon/axi-fan-control.c               |    1 -
 drivers/hwmon/cros_ec_hwmon.c                 |    1 -
 drivers/hwmon/gxp-fan-ctrl.c                  |    1 -
 drivers/hwmon/iio_hwmon.c                     |    1 -
 drivers/hwmon/intel-m10-bmc-hwmon.c           |    1 -
 drivers/hwmon/jc42.c                          |    1 -
 drivers/hwmon/lan966x-hwmon.c                 |    1 -
 drivers/hwmon/lm70.c                          |    1 -
 drivers/hwmon/lm75.c                          |    1 -
 drivers/hwmon/ltc2947-core.c                  |    1 -
 drivers/hwmon/ltc4282.c                       |    1 -
 drivers/hwmon/ltc4283.c                       |    1 -
 drivers/hwmon/ltq-cputemp.c                   |    1 -
 drivers/hwmon/max197.c                        |    1 -
 drivers/hwmon/mc13783-adc.c                   |    1 -
 drivers/hwmon/mr75203.c                       |    1 -
 drivers/hwmon/ntc_thermistor.c                |    1 -
 drivers/hwmon/occ/p9_sbe.c                    |    1 -
 drivers/hwmon/pmbus/adp1050.c                 |    1 -
 drivers/hwmon/pmbus/e50sn12051.c              |    1 -
 drivers/hwmon/pmbus/lt3074.c                  |    1 -
 drivers/hwmon/pmbus/max17616.c                |    1 -
 drivers/hwmon/pmbus/max20830.c                |    1 -
 drivers/hwmon/pmbus/mp2975.c                  |    1 -
 drivers/hwmon/pmbus/stef48h28.c               |    1 -
 drivers/hwmon/pwm-fan.c                       |    1 -
 drivers/hwmon/sch5627.c                       |    1 -
 drivers/hwmon/sch5636.c                       |    1 -
 drivers/hwmon/sl28cpld-hwmon.c                |    1 -
 drivers/hwmon/smpro-hwmon.c                   |    1 -
 drivers/hwmon/sparx5-temp.c                   |    1 -
 drivers/hwmon/tmp102.c                        |    1 -
 drivers/hwmon/tmp108.c                        |    1 -
 drivers/hwtracing/coresight/ultrasoc-smb.c    |    1 -
 drivers/i2c/busses/i2c-amd-asf-plat.c         |    1 -
 drivers/i2c/busses/i2c-gxp.c                  |    1 -
 drivers/i2c/busses/i2c-hisi.c                 |    1 -
 drivers/i2c/busses/i2c-rtl9300.c              |    1 -
 drivers/i2c/busses/i2c-rzv2m.c                |    1 -
 drivers/i2c/i2c-core.h                        |    1 +
 drivers/iio/accel/adxl313_i2c.c               |    1 -
 drivers/iio/accel/adxl313_spi.c               |    1 -
 drivers/iio/accel/adxl355_core.c              |    1 -
 drivers/iio/accel/adxl355_i2c.c               |    1 -
 drivers/iio/accel/adxl355_spi.c               |    1 -
 drivers/iio/accel/adxl367.c                   |    1 -
 drivers/iio/accel/adxl367_i2c.c               |    1 -
 drivers/iio/accel/adxl367_spi.c               |    1 -
 drivers/iio/accel/adxl372_i2c.c               |    1 -
 drivers/iio/accel/adxl372_spi.c               |    1 -
 drivers/iio/accel/adxl380_i2c.c               |    1 -
 drivers/iio/accel/adxl380_spi.c               |    1 -
 drivers/iio/accel/bma180.c                    |    1 -
 drivers/iio/accel/bma220_core.c               |    1 -
 drivers/iio/accel/bma220_i2c.c                |    1 -
 drivers/iio/accel/bma220_spi.c                |    1 -
 drivers/iio/accel/bma400_i2c.c                |    1 -
 drivers/iio/accel/bma400_spi.c                |    1 -
 drivers/iio/accel/bmc150-accel-i2c.c          |    1 -
 drivers/iio/accel/bmc150-accel-spi.c          |    1 -
 drivers/iio/accel/bmi088-accel-i2c.c          |    1 -
 drivers/iio/accel/dmard06.c                   |    1 -
 drivers/iio/accel/fxls8962af-core.c           |    1 -
 drivers/iio/accel/fxls8962af-i2c.c            |    1 -
 drivers/iio/accel/fxls8962af-spi.c            |    1 -
 drivers/iio/accel/hid-sensor-accel-3d.c       |    1 -
 drivers/iio/accel/kxcjk-1013.c                |    1 -
 drivers/iio/accel/kxsd9-i2c.c                 |    1 -
 drivers/iio/accel/kxsd9-spi.c                 |    1 -
 drivers/iio/accel/mma7660.c                   |    1 -
 drivers/iio/accel/mma8452.c                   |    1 -
 drivers/iio/accel/mma9551.c                   |    1 -
 drivers/iio/accel/mma9553.c                   |    1 -
 drivers/iio/accel/msa311.c                    |    1 -
 drivers/iio/accel/mxc4005.c                   |    1 -
 drivers/iio/accel/mxc6255.c                   |    1 -
 drivers/iio/accel/st_accel_i2c.c              |    1 -
 drivers/iio/accel/st_accel_spi.c              |    1 -
 drivers/iio/accel/stk8ba50.c                  |    1 -
 drivers/iio/adc/88pm886-gpadc.c               |    1 -
 drivers/iio/adc/ad4000.c                      |    1 -
 drivers/iio/adc/ad4080.c                      |    1 -
 drivers/iio/adc/ad4134.c                      |    1 -
 drivers/iio/adc/ad4851.c                      |    1 -
 drivers/iio/adc/ad7124.c                      |    1 -
 drivers/iio/adc/ad7173.c                      |    1 -
 drivers/iio/adc/ad7191.c                      |    1 -
 drivers/iio/adc/ad7192.c                      |    1 -
 drivers/iio/adc/ad7280a.c                     |    1 -
 drivers/iio/adc/ad7292.c                      |    1 -
 drivers/iio/adc/ad7298.c                      |    1 -
 drivers/iio/adc/ad7405.c                      |    1 -
 drivers/iio/adc/ad7606_par.c                  |    1 -
 drivers/iio/adc/ad7625.c                      |    1 -
 drivers/iio/adc/ad7779.c                      |    1 -
 drivers/iio/adc/adi-axi-adc.c                 |    1 -
 drivers/iio/adc/at91-sama5d2_adc.c            |    1 -
 drivers/iio/adc/axp20x_adc.c                  |    1 -
 drivers/iio/adc/bcm_iproc_adc.c               |    1 -
 drivers/iio/adc/berlin2-adc.c                 |    1 -
 drivers/iio/adc/cpcap-adc.c                   |    1 -
 drivers/iio/adc/envelope-detector.c           |    1 -
 drivers/iio/adc/fsl-imx25-gcq.c               |    1 -
 drivers/iio/adc/hi8435.c                      |    1 -
 drivers/iio/adc/hx711.c                       |    1 -
 drivers/iio/adc/imx7d_adc.c                   |    1 -
 drivers/iio/adc/imx8qxp-adc.c                 |    1 -
 drivers/iio/adc/imx93_adc.c                   |    1 -
 drivers/iio/adc/ingenic-adc.c                 |    1 -
 drivers/iio/adc/intel_dc_ti_adc.c             |    1 -
 drivers/iio/adc/intel_mrfld_adc.c             |    1 -
 drivers/iio/adc/lpc18xx_adc.c                 |    1 -
 drivers/iio/adc/lpc32xx_adc.c                 |    1 -
 drivers/iio/adc/ltc2496.c                     |    1 -
 drivers/iio/adc/ltc2497.c                     |    1 -
 drivers/iio/adc/max1027.c                     |    1 -
 drivers/iio/adc/max11100.c                    |    1 -
 drivers/iio/adc/max1118.c                     |    1 -
 drivers/iio/adc/max1363.c                     |    1 -
 drivers/iio/adc/max14001.c                    |    1 -
 drivers/iio/adc/max34408.c                    |    1 -
 drivers/iio/adc/max77541-adc.c                |    1 -
 drivers/iio/adc/max9611.c                     |    1 -
 drivers/iio/adc/mcp320x.c                     |    1 -
 drivers/iio/adc/mcp3422.c                     |    1 -
 drivers/iio/adc/mcp3911.c                     |    1 -
 drivers/iio/adc/mp2629_adc.c                  |    1 -
 drivers/iio/adc/mt6359-auxadc.c               |    1 -
 drivers/iio/adc/mt6360-adc.c                  |    1 -
 drivers/iio/adc/mt6370-adc.c                  |    1 -
 drivers/iio/adc/mt6577_auxadc.c               |    1 -
 drivers/iio/adc/nau7802.c                     |    1 -
 drivers/iio/adc/nct7201.c                     |    1 -
 drivers/iio/adc/npcm_adc.c                    |    1 -
 drivers/iio/adc/nxp-sar-adc.c                 |    1 -
 drivers/iio/adc/qcom-pm8xxx-xoadc.c           |    1 -
 drivers/iio/adc/qcom-spmi-adc5-gen3.c         |    1 -
 drivers/iio/adc/qcom-spmi-adc5.c              |    1 -
 drivers/iio/adc/qcom-spmi-rradc.c             |    1 -
 drivers/iio/adc/qcom-spmi-vadc.c              |    1 -
 drivers/iio/adc/rohm-bd79112.c                |    1 -
 drivers/iio/adc/rohm-bd79124.c                |    1 -
 drivers/iio/adc/rtq6056.c                     |    1 -
 drivers/iio/adc/rzg2l_adc.c                   |    1 -
 drivers/iio/adc/rzn1-adc.c                    |    1 -
 drivers/iio/adc/rzt2h_adc.c                   |    1 -
 drivers/iio/adc/sd_adc_modulator.c            |    1 -
 drivers/iio/adc/sophgo-cv1800b-adc.c          |    1 -
 drivers/iio/adc/spear_adc.c                   |    1 -
 drivers/iio/adc/stm32-adc.c                   |    1 -
 drivers/iio/adc/sun20i-gpadc-iio.c            |    1 -
 drivers/iio/adc/ti-adc081c.c                  |    1 -
 drivers/iio/adc/ti-adc0832.c                  |    1 -
 drivers/iio/adc/ti-adc084s021.c               |    1 -
 drivers/iio/adc/ti-adc108s102.c               |    1 -
 drivers/iio/adc/ti-adc128s052.c               |    1 -
 drivers/iio/adc/ti-adc161s626.c               |    1 -
 drivers/iio/adc/ti-ads1018.c                  |    1 -
 drivers/iio/adc/ti-ads124s08.c                |    1 -
 drivers/iio/adc/ti-ads131m02.c                |    1 -
 drivers/iio/adc/ti-ads8688.c                  |    1 -
 drivers/iio/adc/ti-tlc4541.c                  |    1 -
 drivers/iio/adc/twl4030-madc.c                |    1 -
 drivers/iio/adc/twl6030-gpadc.c               |    1 -
 drivers/iio/adc/vf610_adc.c                   |    1 -
 drivers/iio/adc/xilinx-ams.c                  |    1 -
 drivers/iio/adc/xilinx-xadc-core.c            |    1 -
 drivers/iio/addac/ad74413r.c                  |    1 -
 drivers/iio/afe/iio-rescale.c                 |    1 -
 drivers/iio/amplifiers/ad8366.c               |    1 -
 drivers/iio/amplifiers/adl8113.c              |    1 -
 drivers/iio/amplifiers/hmc425a.c              |    1 -
 drivers/iio/cdc/ad7150.c                      |    1 -
 drivers/iio/chemical/ams-iaq-core.c           |    1 -
 drivers/iio/chemical/atlas-ezo-sensor.c       |    1 -
 drivers/iio/chemical/atlas-sensor.c           |    1 -
 drivers/iio/chemical/bme680_spi.c             |    1 -
 drivers/iio/chemical/mhz19b.c                 |    1 -
 drivers/iio/chemical/pms7003.c                |    1 -
 drivers/iio/chemical/scd30_i2c.c              |    1 -
 drivers/iio/chemical/scd30_serial.c           |    1 -
 drivers/iio/chemical/sgp30.c                  |    1 -
 drivers/iio/chemical/sps30_i2c.c              |    1 -
 drivers/iio/chemical/sps30_serial.c           |    1 -
 drivers/iio/chemical/sunrise_co2.c            |    1 -
 drivers/iio/chemical/vz89x.c                  |    1 -
 .../cros_ec_sensors/cros_ec_lid_angle.c       |    1 -
 .../common/cros_ec_sensors/cros_ec_sensors.c  |    1 -
 drivers/iio/common/ssp_sensors/ssp_dev.c      |    1 -
 drivers/iio/dac/ad3530r.c                     |    1 -
 drivers/iio/dac/ad3552r-hs.c                  |    1 -
 drivers/iio/dac/ad5446-i2c.c                  |    1 -
 drivers/iio/dac/ad5446-spi.c                  |    1 -
 drivers/iio/dac/ad5592r.c                     |    1 -
 drivers/iio/dac/ad5593r.c                     |    1 -
 drivers/iio/dac/ad5758.c                      |    1 -
 drivers/iio/dac/ad7293.c                      |    1 -
 drivers/iio/dac/ad7303.c                      |    1 -
 drivers/iio/dac/ad8460.c                      |    1 -
 drivers/iio/dac/ad9739a.c                     |    1 -
 drivers/iio/dac/adi-axi-dac.c                 |    1 -
 drivers/iio/dac/dpot-dac.c                    |    1 -
 drivers/iio/dac/lpc18xx_dac.c                 |    1 -
 drivers/iio/dac/ltc2664.c                     |    1 -
 drivers/iio/dac/ltc2688.c                     |    1 -
 drivers/iio/dac/max22007.c                    |    1 -
 drivers/iio/dac/max5522.c                     |    1 -
 drivers/iio/dac/mcp4725.c                     |    1 -
 drivers/iio/dac/mcp4728.c                     |    1 -
 drivers/iio/dac/mcp47feb02.c                  |    1 -
 drivers/iio/dac/mcp4821.c                     |    1 -
 drivers/iio/dac/stm32-dac-core.c              |    1 -
 drivers/iio/dac/stm32-dac.c                   |    1 -
 drivers/iio/dac/ti-dac082s085.c               |    1 -
 drivers/iio/dac/ti-dac5571.c                  |    1 -
 drivers/iio/dac/vf610_dac.c                   |    1 -
 drivers/iio/filter/admv8818.c                 |    1 -
 drivers/iio/frequency/adf4350.c               |    1 -
 drivers/iio/frequency/admfm2000.c             |    1 -
 drivers/iio/frequency/admv1013.c              |    1 -
 drivers/iio/frequency/admv1014.c              |    1 -
 drivers/iio/frequency/adrf6780.c              |    1 -
 drivers/iio/gyro/bmg160_i2c.c                 |    1 -
 drivers/iio/gyro/fxas21002c_i2c.c             |    1 -
 drivers/iio/gyro/fxas21002c_spi.c             |    1 -
 drivers/iio/gyro/hid-sensor-gyro-3d.c         |    1 -
 drivers/iio/gyro/st_gyro_i2c.c                |    1 -
 drivers/iio/gyro/st_gyro_spi.c                |    1 -
 drivers/iio/health/max30102.c                 |    1 -
 drivers/iio/humidity/dht11.c                  |    1 -
 drivers/iio/humidity/ens210.c                 |    1 -
 drivers/iio/humidity/hdc100x.c                |    1 -
 drivers/iio/humidity/hid-sensor-humidity.c    |    1 -
 drivers/iio/humidity/hts221_i2c.c             |    1 -
 drivers/iio/humidity/htu21.c                  |    1 -
 drivers/iio/humidity/si7020.c                 |    1 -
 drivers/iio/imu/adis16475.c                   |    1 -
 drivers/iio/imu/adis16480.c                   |    1 -
 drivers/iio/imu/adis16550.c                   |    1 -
 drivers/iio/imu/bmi160/bmi160_i2c.c           |    1 -
 drivers/iio/imu/bmi160/bmi160_spi.c           |    1 -
 drivers/iio/imu/bmi270/bmi270_i2c.c           |    1 -
 drivers/iio/imu/bmi270/bmi270_spi.c           |    1 -
 drivers/iio/imu/bmi323/bmi323_i2c.c           |    1 -
 drivers/iio/imu/bmi323/bmi323_spi.c           |    1 -
 drivers/iio/imu/bno055/bno055_i2c.c           |    1 -
 drivers/iio/imu/bno055/bno055_ser_core.c      |    1 -
 drivers/iio/imu/fxos8700_i2c.c                |    1 -
 drivers/iio/imu/fxos8700_spi.c                |    1 -
 .../iio/imu/inv_icm42600/inv_icm42600_i2c.c   |    1 -
 .../iio/imu/inv_icm42600/inv_icm42600_spi.c   |    1 -
 .../iio/imu/inv_icm45600/inv_icm45600_i2c.c   |    1 -
 .../iio/imu/inv_icm45600/inv_icm45600_i3c.c   |    1 -
 .../iio/imu/inv_icm45600/inv_icm45600_spi.c   |    1 -
 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c     |    1 -
 drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c     |    1 -
 drivers/iio/imu/kmx61.c                       |    1 -
 drivers/iio/imu/smi330/smi330_i2c.c           |    1 -
 drivers/iio/imu/smi330/smi330_spi.c           |    1 -
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c   |    1 -
 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c   |    1 -
 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c   |    1 -
 drivers/iio/light/al3000a.c                   |    1 -
 drivers/iio/light/al3010.c                    |    1 -
 drivers/iio/light/al3320a.c                   |    1 -
 drivers/iio/light/bh1780.c                    |    1 -
 drivers/iio/light/cm32181.c                   |    1 -
 drivers/iio/light/cm3232.c                    |    1 -
 drivers/iio/light/cm3605.c                    |    1 -
 drivers/iio/light/cros_ec_light_prox.c        |    1 -
 drivers/iio/light/gp2ap020a00f.c              |    1 -
 drivers/iio/light/hid-sensor-als.c            |    1 -
 drivers/iio/light/hid-sensor-prox.c           |    1 -
 drivers/iio/light/isl29018.c                  |    1 -
 drivers/iio/light/jsa1212.c                   |    1 -
 drivers/iio/light/ltr501.c                    |    1 -
 drivers/iio/light/ltrf216a.c                  |    1 -
 drivers/iio/light/max44000.c                  |    1 -
 drivers/iio/light/opt3001.c                   |    1 -
 drivers/iio/light/rpr0521.c                   |    1 -
 drivers/iio/light/st_uvis25_i2c.c             |    1 -
 drivers/iio/light/st_uvis25_spi.c             |    1 -
 drivers/iio/light/stk3310.c                   |    1 -
 drivers/iio/light/tsl2563.c                   |    1 -
 drivers/iio/light/us5182d.c                   |    1 -
 drivers/iio/light/veml6046x00.c               |    1 -
 drivers/iio/light/vl6180.c                    |    1 -
 drivers/iio/magnetometer/ak8974.c             |    1 -
 drivers/iio/magnetometer/ak8975.c             |    1 -
 drivers/iio/magnetometer/bmc150_magn_i2c.c    |    1 -
 drivers/iio/magnetometer/bmc150_magn_spi.c    |    1 -
 drivers/iio/magnetometer/hid-sensor-magn-3d.c |    1 -
 drivers/iio/magnetometer/mmc35240.c           |    1 -
 drivers/iio/magnetometer/mmc5633.c            |    1 -
 drivers/iio/magnetometer/si7210.c             |    1 -
 drivers/iio/magnetometer/st_magn_i2c.c        |    1 -
 drivers/iio/magnetometer/st_magn_spi.c        |    1 -
 drivers/iio/magnetometer/tlv493d.c            |    1 -
 drivers/iio/magnetometer/yamaha-yas530.c      |    1 -
 drivers/iio/multiplexer/iio-mux.c             |    1 -
 drivers/iio/orientation/hid-sensor-incl-3d.c  |    1 -
 drivers/iio/orientation/hid-sensor-rotation.c |    1 -
 .../position/hid-sensor-custom-intel-hinge.c  |    1 -
 drivers/iio/potentiometer/ad5272.c            |    1 -
 drivers/iio/potentiometer/ds1803.c            |    1 -
 drivers/iio/potentiometer/max5432.c           |    1 -
 drivers/iio/potentiometer/max5481.c           |    1 -
 drivers/iio/potentiometer/max5487.c           |    1 -
 drivers/iio/potentiometer/mcp4018.c           |    1 -
 drivers/iio/potentiometer/mcp41010.c          |    1 -
 drivers/iio/potentiometer/mcp4131.c           |    1 -
 drivers/iio/potentiometer/mcp4531.c           |    1 -
 drivers/iio/potentiostat/lmp91000.c           |    1 -
 drivers/iio/pressure/abp2030pa_i2c.c          |    1 -
 drivers/iio/pressure/abp2030pa_spi.c          |    1 -
 drivers/iio/pressure/adp810.c                 |    1 -
 drivers/iio/pressure/cros_ec_baro.c           |    1 -
 drivers/iio/pressure/hid-sensor-press.c       |    1 -
 drivers/iio/pressure/hp206c.c                 |    1 -
 drivers/iio/pressure/hsc030pa.c               |    1 -
 drivers/iio/pressure/hsc030pa_i2c.c           |    1 -
 drivers/iio/pressure/hsc030pa_spi.c           |    1 -
 drivers/iio/pressure/icp10100.c               |    1 -
 drivers/iio/pressure/mprls0025pa.c            |    1 -
 drivers/iio/pressure/mprls0025pa_i2c.c        |    1 -
 drivers/iio/pressure/mprls0025pa_spi.c        |    1 -
 drivers/iio/pressure/ms5611_i2c.c             |    1 -
 drivers/iio/pressure/ms5611_spi.c             |    1 -
 drivers/iio/pressure/ms5637.c                 |    1 -
 drivers/iio/pressure/sdp500.c                 |    1 -
 drivers/iio/pressure/st_pressure_i2c.c        |    1 -
 drivers/iio/pressure/st_pressure_spi.c        |    1 -
 drivers/iio/pressure/zpa2326_i2c.c            |    1 -
 drivers/iio/pressure/zpa2326_spi.c            |    1 -
 drivers/iio/proximity/as3935.c                |    1 -
 .../iio/proximity/cros_ec_mkbp_proximity.c    |    1 -
 drivers/iio/proximity/d3323aa.c               |    1 -
 drivers/iio/proximity/hx9023s.c               |    1 -
 drivers/iio/proximity/isl29501.c              |    1 -
 drivers/iio/proximity/mb1232.c                |    1 -
 drivers/iio/proximity/ping.c                  |    1 -
 .../iio/proximity/pulsedlight-lidar-lite-v2.c |    1 -
 drivers/iio/proximity/srf04.c                 |    1 -
 drivers/iio/proximity/sx9310.c                |    1 -
 drivers/iio/proximity/sx9324.c                |    1 -
 drivers/iio/proximity/sx9360.c                |    1 -
 drivers/iio/proximity/vl53l1x-i2c.c           |    1 -
 drivers/iio/resolver/ad2s1200.c               |    1 -
 .../iio/temperature/hid-sensor-temperature.c  |    1 -
 drivers/iio/temperature/ltc2983.c             |    1 -
 drivers/iio/temperature/max31856.c            |    1 -
 drivers/iio/temperature/max31865.c            |    1 -
 drivers/iio/temperature/maxim_thermocouple.c  |    1 -
 drivers/iio/temperature/mcp9600.c             |    1 -
 drivers/iio/temperature/mlx90614.c            |    1 -
 drivers/iio/temperature/mlx90632.c            |    1 -
 drivers/iio/temperature/mlx90635.c            |    1 -
 drivers/iio/temperature/tmp006.c              |    1 -
 drivers/iio/temperature/tmp007.c              |    1 -
 drivers/iio/temperature/tsys01.c              |    1 -
 drivers/iio/trigger/stm32-lptimer-trigger.c   |    1 -
 drivers/iio/trigger/stm32-timer-trigger.c     |    1 -
 drivers/input/keyboard/adp5585-keys.c         |    1 -
 drivers/input/keyboard/adp5588-keys.c         |    1 -
 drivers/input/keyboard/charlieplex_keypad.c   |    1 -
 drivers/input/keyboard/clps711x-keypad.c      |    1 -
 drivers/input/keyboard/ep93xx_keypad.c        |    1 -
 drivers/input/keyboard/max7360-keypad.c       |    1 -
 drivers/input/keyboard/pinephone-keyboard.c   |    1 -
 drivers/input/misc/ariel-pwrbutton.c          |    1 -
 drivers/input/misc/da9063_onkey.c             |    1 -
 drivers/input/misc/gpio_decoder.c             |    1 -
 drivers/input/misc/iqs269a.c                  |    1 -
 drivers/input/misc/iqs626a.c                  |    1 -
 drivers/input/misc/iqs7222.c                  |    1 -
 drivers/input/misc/mma8450.c                  |    1 -
 drivers/input/misc/rt5120-pwrkey.c            |    1 -
 drivers/input/misc/sc27xx-vibra.c             |    1 -
 drivers/input/misc/twl4030-pwrbutton.c        |    1 -
 drivers/input/serio/sun4i-ps2.c               |    1 -
 drivers/input/serio/xilinx_ps2.c              |    1 -
 drivers/input/touchscreen/cyttsp5.c           |    1 -
 drivers/input/touchscreen/himax_hx852x.c      |    1 -
 drivers/input/touchscreen/hynitron_cstxxx.c   |    1 -
 drivers/input/touchscreen/ili210x.c           |    1 -
 drivers/input/touchscreen/iqs5xx.c            |    1 -
 drivers/input/touchscreen/msg2638.c           |    1 -
 .../input/touchscreen/resistive-adc-touch.c   |    1 -
 drivers/input/touchscreen/tsc2007_core.c      |    1 -
 drivers/interconnect/mediatek/mt8183.c        |    1 -
 drivers/interconnect/mediatek/mt8195.c        |    1 -
 drivers/interconnect/mediatek/mt8196.c        |    1 -
 drivers/interconnect/qcom/msm8909.c           |    1 -
 drivers/interconnect/qcom/msm8937.c           |    1 -
 drivers/interconnect/qcom/msm8939.c           |    1 -
 drivers/interconnect/qcom/msm8953.c           |    1 -
 drivers/interconnect/qcom/msm8976.c           |    1 -
 drivers/interconnect/qcom/msm8996.c           |    1 -
 drivers/interconnect/qcom/qcm2290.c           |    1 -
 drivers/interconnect/qcom/qcs404.c            |    1 -
 drivers/interconnect/qcom/qdu1000.c           |    1 -
 drivers/interconnect/qcom/sa8775p.c           |    1 -
 drivers/interconnect/qcom/sc7180.c            |    1 -
 drivers/interconnect/qcom/sc7280.c            |    1 -
 drivers/interconnect/qcom/sc8180x.c           |    1 -
 drivers/interconnect/qcom/sc8280xp.c          |    1 -
 drivers/interconnect/qcom/sdm660.c            |    1 -
 drivers/interconnect/qcom/sdm670.c            |    1 -
 drivers/interconnect/qcom/sdm845.c            |    1 -
 drivers/interconnect/qcom/sdx55.c             |    1 -
 drivers/interconnect/qcom/sdx65.c             |    1 -
 drivers/interconnect/qcom/sm6115.c            |    1 -
 drivers/interconnect/qcom/sm6350.c            |    1 -
 drivers/interconnect/qcom/sm7150.c            |    1 -
 drivers/interconnect/qcom/sm8150.c            |    1 -
 drivers/interconnect/qcom/sm8250.c            |    1 -
 drivers/interconnect/qcom/sm8350.c            |    1 -
 drivers/interconnect/qcom/sm8450.c            |    1 -
 drivers/interconnect/qcom/sm8550.c            |    1 -
 .../iommu/arm/arm-smmu/arm-smmu-qcom-debug.c  |    1 -
 drivers/irqchip/irq-imx-intmux.c              |    1 -
 drivers/irqchip/irq-lan966x-oic.c             |    1 -
 drivers/irqchip/irq-sl28cpld.c                |    1 -
 drivers/irqchip/irq-stm32mp-exti.c            |    1 -
 drivers/leds/flash/leds-rt8515.c              |    1 -
 drivers/leds/leds-aw200xx.c                   |    1 -
 drivers/leds/leds-bd2606mvv.c                 |    1 -
 drivers/leds/leds-cht-wcove.c                 |    1 -
 drivers/leds/leds-cr0014114.c                 |    1 -
 drivers/leds/leds-cros_ec.c                   |    1 -
 drivers/leds/leds-el15203000.c                |    1 -
 drivers/leds/leds-gpio.c                      |    1 -
 drivers/leds/leds-is31fl319x.c                |    1 -
 drivers/leds/leds-lm36274.c                   |    1 -
 drivers/leds/leds-lm3692x.c                   |    1 -
 drivers/leds/leds-lm3697.c                    |    1 -
 drivers/leds/leds-lp50xx.c                    |    1 -
 drivers/leds/leds-lt3593.c                    |    1 -
 drivers/leds/leds-max5970.c                   |    1 -
 drivers/leds/leds-mlxcpld.c                   |    1 -
 drivers/leds/leds-nic78bx.c                   |    1 -
 drivers/leds/leds-pca995x.c                   |    1 -
 drivers/leds/leds-regulator.c                 |    1 -
 drivers/leds/leds-spi-byte.c                  |    1 -
 drivers/leds/leds-sun50i-a100.c               |    1 -
 drivers/leds/rgb/leds-group-multicolor.c      |    1 -
 drivers/leds/rgb/leds-mt6370-rgb.c            |    1 -
 drivers/leds/rgb/leds-pwm-multicolor.c        |    1 -
 drivers/mailbox/mailbox-mpfs.c                |    1 -
 drivers/mailbox/platform_mhu.c                |    1 -
 .../media/cec/platform/cros-ec/cros-ec-cec.c  |    1 -
 drivers/media/firewire/firedtv-fw.c           |    1 -
 drivers/media/i2c/adv7180.c                   |    1 -
 drivers/media/i2c/cvs/core.c                  |    1 -
 drivers/media/i2c/gc0308.c                    |    1 -
 drivers/media/i2c/gc05a2.c                    |    1 -
 drivers/media/i2c/gc08a3.c                    |    1 -
 drivers/media/i2c/lm3560.c                    |    1 -
 drivers/media/i2c/mt9m114.c                   |    1 -
 drivers/media/i2c/mt9p031.c                   |    1 -
 drivers/media/i2c/mt9v032.c                   |    1 -
 drivers/media/i2c/ov2680.c                    |    1 -
 drivers/media/i2c/ov5640.c                    |    1 -
 drivers/media/i2c/ov5670.c                    |    1 -
 drivers/media/i2c/ov5675.c                    |    1 -
 drivers/media/i2c/ov64a40.c                   |    1 -
 drivers/media/i2c/ov7251.c                    |    1 -
 drivers/media/i2c/ov7670.c                    |    1 -
 drivers/media/i2c/ov8865.c                    |    1 -
 drivers/media/i2c/t4ka3.c                     |    1 -
 drivers/media/i2c/tvp514x.c                   |    1 -
 drivers/media/i2c/video-i2c.c                 |    1 -
 .../platform/arm/mali-c55/mali-c55-core.c     |    1 -
 .../platform/chips-media/coda/imx-vdoa.c      |    1 -
 .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c  |    1 -
 .../platform/microchip/microchip-csi2dc.c     |    1 -
 drivers/media/platform/qcom/venus/vdec.c      |    1 -
 drivers/media/platform/qcom/venus/venc.c      |    1 -
 drivers/media/platform/renesas/rcar-fcp.c     |    1 -
 .../platform/renesas/rzg2l-cru/rzg2l-core.c   |    1 -
 drivers/media/platform/st/sti/hva/hva-v4l2.c  |    1 -
 .../media/platform/sunxi/sun8i-di/sun8i-di.c  |    1 -
 .../sunxi/sun8i-rotate/sun8i_rotate.c         |    1 -
 drivers/media/platform/ti/vpe/vip.c           |    1 +
 drivers/media/rc/ir-spi.c                     |    1 -
 drivers/media/usb/em28xx/em28xx.h             |    1 +
 drivers/memory/stm32_omm.c                    |    1 -
 drivers/memory/tegra/tegra186-emc.c           |    1 -
 drivers/memory/tegra/tegra186.c               |    1 -
 drivers/memory/tegra/tegra210-emc-core.c      |    1 -
 drivers/mfd/adp5585.c                         |    1 -
 drivers/mfd/atmel-hlcdc.c                     |    1 -
 drivers/mfd/atmel-smc.c                       |    1 -
 drivers/mfd/cros_ec_dev.c                     |    1 -
 drivers/mfd/cs42l43-i2c.c                     |    1 -
 drivers/mfd/cs42l43-sdw.c                     |    1 -
 drivers/mfd/hi655x-pmic.c                     |    1 -
 drivers/mfd/intel-lpss-acpi.c                 |    1 -
 drivers/mfd/intel-lpss-pci.c                  |    1 -
 drivers/mfd/intel_soc_pmic_bxtwc.c            |    1 -
 drivers/mfd/intel_soc_pmic_crc.c              |    1 -
 drivers/mfd/kempld-core.c                     |    1 -
 drivers/mfd/lochnagar-i2c.c                   |    1 -
 drivers/mfd/lp873x.c                          |    2 +-
 drivers/mfd/lp87565.c                         |    1 -
 drivers/mfd/max14577.c                        |    1 -
 drivers/mfd/max7360.c                         |    1 -
 drivers/mfd/max77759.c                        |    1 -
 drivers/mfd/max77843.c                        |    1 -
 drivers/mfd/mc13xxx-spi.c                     |    1 -
 drivers/mfd/motorola-cpcap.c                  |    1 -
 drivers/mfd/ocelot-spi.c                      |    1 -
 drivers/mfd/rt5033.c                          |    3 +-
 drivers/mfd/rt5120.c                          |    1 -
 drivers/mfd/rz-mtu3.c                         |    1 -
 drivers/mfd/sec-acpm.c                        |    1 -
 drivers/mfd/sec-i2c.c                         |    1 -
 drivers/mfd/simple-mfd-i2c.c                  |    1 -
 drivers/mfd/tps6594-i2c.c                     |    1 -
 drivers/mfd/tps6594-spi.c                     |    1 -
 drivers/mfd/upboard-fpga.c                    |    1 -
 drivers/mfd/wm831x-core.c                     |    2 +-
 drivers/misc/eeprom/at24.c                    |    1 -
 drivers/misc/eeprom/ee1004.c                  |    1 -
 drivers/misc/eeprom/eeprom_93xx46.c           |    1 -
 drivers/misc/eeprom/idt_89hpesx.c             |    1 -
 drivers/misc/hisi_hikey_usb.c                 |    1 -
 drivers/misc/pvpanic/pvpanic-mmio.c           |    1 -
 drivers/misc/pvpanic/pvpanic.c                |    1 -
 drivers/misc/smpro-errmon.c                   |    1 -
 drivers/misc/smpro-misc.c                     |    1 -
 drivers/mmc/host/litex_mmc.c                  |    1 -
 drivers/mmc/host/owl-mmc.c                    |    1 -
 drivers/mmc/host/renesas_sdhi_internal_dmac.c |    1 -
 drivers/mmc/host/renesas_sdhi_sys_dmac.c      |    1 -
 drivers/mmc/host/sdhci-npcm.c                 |    1 -
 drivers/mmc/host/sdhci-of-ma35d1.c            |    1 -
 drivers/mmc/host/sh_mmcif.c                   |    1 -
 drivers/mmc/host/sunxi-mmc.c                  |    1 -
 drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c  |    1 -
 drivers/mux/adgs1408.c                        |    1 -
 drivers/mux/gpio.c                            |    1 -
 drivers/net/can/spi/hi311x.c                  |    1 -
 .../net/can/spi/mcp251xfd/mcp251xfd-core.c    |    1 -
 drivers/net/dsa/microchip/ksz8863_smi.c       |    2 +-
 drivers/net/dsa/mt7530-mmio.c                 |    1 -
 drivers/net/dsa/ocelot/seville_vsc9953.c      |    1 -
 drivers/net/ethernet/calxeda/xgmac.c          |    1 -
 drivers/net/ethernet/ezchip/nps_enet.c        |    1 -
 drivers/net/ethernet/faraday/ftmac100.c       |    1 -
 .../net/ethernet/freescale/dpaa/dpaa_eth.c    |    1 -
 .../net/ethernet/freescale/enetc/enetc_ierb.c |    1 -
 drivers/net/ethernet/ibm/emac/tah.c           |    1 -
 drivers/net/ethernet/ibm/emac/zmii.c          |    1 -
 drivers/net/ethernet/marvell/mvmdio.c         |    1 -
 .../mellanox/mlxbf_gige/mlxbf_gige_mdio.c     |    1 -
 drivers/net/ethernet/mellanox/mlxsw/i2c.c     |    1 -
 drivers/net/ethernet/mellanox/mlxsw/minimal.c |    1 -
 .../ethernet/stmicro/stmmac/dwmac-nuvoton.c   |    1 -
 .../ethernet/stmicro/stmmac/dwmac-sophgo.c    |    1 -
 .../ethernet/stmicro/stmmac/dwmac-spacemit.c  |    1 -
 .../ethernet/stmicro/stmmac/dwmac-starfive.c  |    1 -
 drivers/net/ethernet/xscale/ptp_ixp46x.c      |    1 -
 drivers/net/ieee802154/mrf24j40.c             |    1 -
 drivers/net/mdio/mdio-realtek-rtl9300.c       |    1 -
 drivers/net/mhi_net.c                         |    1 -
 drivers/net/wan/fsl_qmc_hdlc.c                |    1 -
 drivers/net/wireless/ath/ath9k/ahb.c          |    1 -
 .../broadcom/brcm80211/brcmfmac/dmi.c         |    1 -
 drivers/net/wireless/intersil/p54/p54spi.c    |    1 -
 drivers/net/wireless/ti/wl1251/sdio.c         |    1 -
 drivers/net/wireless/ti/wl12xx/main.c         |    1 -
 drivers/net/wireless/ti/wl18xx/main.c         |    1 -
 drivers/net/wwan/mhi_wwan_ctrl.c              |    1 -
 drivers/net/wwan/mhi_wwan_mbim.c              |    1 -
 drivers/net/wwan/qcom_bam_dmux.c              |    1 -
 drivers/net/wwan/rpmsg_wwan_ctrl.c            |    1 -
 drivers/nfc/microread/mei.c                   |    1 -
 drivers/nfc/pn544/mei.c                       |    1 -
 drivers/nfc/s3fwrn5/uart.c                    |    1 -
 drivers/nvmem/an8855-efuse.c                  |    1 -
 drivers/nvmem/apple-efuses.c                  |    1 -
 drivers/nvmem/brcm_nvram.c                    |    1 -
 drivers/nvmem/layerscape-sfp.c                |    1 -
 drivers/nvmem/lpc18xx_eeprom.c                |    1 -
 drivers/nvmem/max77759-nvmem.c                |    1 -
 drivers/nvmem/mtk-efuse.c                     |    1 -
 drivers/nvmem/nintendo-otp.c                  |    1 -
 drivers/nvmem/qfprom.c                        |    1 -
 drivers/nvmem/qoriq-efuse.c                   |    1 -
 drivers/nvmem/rcar-efuse.c                    |    1 -
 drivers/nvmem/sec-qfprom.c                    |    1 -
 drivers/nvmem/sunplus-ocotp.c                 |    1 -
 drivers/nvmem/u-boot-env.c                    |    1 -
 drivers/nvmem/uniphier-efuse.c                |    1 -
 drivers/of/device.c                           |    1 -
 drivers/pci/controller/cadence/pcie-sg2042.c  |    1 -
 drivers/pci/controller/dwc/pci-exynos.c       |    1 -
 drivers/pci/controller/dwc/pci-meson.c        |    1 -
 drivers/pci/controller/dwc/pcie-intel-gw.c    |    1 -
 drivers/pci/controller/dwc/pcie-keembay.c     |    1 -
 drivers/pci/controller/dwc/pcie-spacemit-k1.c |    1 -
 drivers/pci/controller/dwc/pcie-stm32.c       |    1 -
 drivers/pci/pwrctrl/generic.c                 |    1 -
 drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c      |    1 -
 drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c      |    1 -
 drivers/perf/arm-ccn.c                        |    1 -
 drivers/perf/fujitsu_uncore_pmu.c             |    1 -
 drivers/perf/hisilicon/hisi_uncore_mn_pmu.c   |    1 -
 drivers/perf/hisilicon/hisi_uncore_noc_pmu.c  |    1 -
 drivers/perf/hisilicon/hisi_uncore_uc_pmu.c   |    1 -
 drivers/perf/riscv_pmu_legacy.c               |    1 -
 drivers/perf/riscv_pmu_sbi.c                  |    1 -
 drivers/perf/starfive_starlink_pmu.c          |    1 -
 drivers/phy/allwinner/phy-sun50i-usb3.c       |    1 -
 drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c |    1 -
 drivers/phy/amlogic/phy-meson-axg-pcie.c      |    1 -
 drivers/phy/amlogic/phy-meson-gxl-usb2.c      |    1 -
 drivers/phy/amlogic/phy-meson8b-usb2.c        |    1 -
 drivers/phy/cadence/cdns-dphy-rx.c            |    1 -
 drivers/phy/hisilicon/phy-hi3670-pcie.c       |    1 -
 drivers/phy/hisilicon/phy-hi6220-usb.c        |    1 -
 drivers/phy/intel/phy-intel-keembay-usb.c     |    1 -
 drivers/phy/marvell/phy-mmp3-hsic.c           |    1 -
 drivers/phy/marvell/phy-mmp3-usb.c            |    1 -
 drivers/phy/marvell/phy-mvebu-sata.c          |    1 -
 drivers/phy/mediatek/phy-mtk-ufs.c            |    1 -
 drivers/phy/phy-snps-eusb2.c                  |    1 -
 drivers/phy/qualcomm/phy-ath79-usb.c          |    1 -
 .../phy/rockchip/phy-rockchip-samsung-dcphy.c |    1 -
 drivers/phy/rockchip/phy-rockchip-usbdp.c     |    1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c    |    1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c    |    1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c    |    1 -
 drivers/pinctrl/bcm/pinctrl-bcm4908.c         |    1 -
 drivers/pinctrl/bcm/pinctrl-bcm63xx.c         |    1 -
 drivers/pinctrl/freescale/pinctrl-imx-scmi.c  |    1 -
 drivers/pinctrl/freescale/pinctrl-imx23.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx25.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx27.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx28.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx35.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx50.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx51.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx53.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6dl.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6q.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6sl.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6sll.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6sx.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx7ulp.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8dxl.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8mq.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8qxp.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8ulp.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx91.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx93.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-vf610.c     |    1 -
 drivers/pinctrl/intel/pinctrl-alderlake.c     |    1 -
 drivers/pinctrl/intel/pinctrl-broxton.c       |    1 -
 drivers/pinctrl/intel/pinctrl-cannonlake.c    |    1 -
 drivers/pinctrl/intel/pinctrl-cedarfork.c     |    1 -
 drivers/pinctrl/intel/pinctrl-denverton.c     |    1 -
 drivers/pinctrl/intel/pinctrl-elkhartlake.c   |    1 -
 drivers/pinctrl/intel/pinctrl-emmitsburg.c    |    1 -
 drivers/pinctrl/intel/pinctrl-geminilake.c    |    1 -
 .../pinctrl/intel/pinctrl-intel-platform.c    |    1 -
 drivers/pinctrl/intel/pinctrl-jasperlake.c    |    1 -
 drivers/pinctrl/intel/pinctrl-lakefield.c     |    1 -
 drivers/pinctrl/intel/pinctrl-lewisburg.c     |    1 -
 drivers/pinctrl/intel/pinctrl-merrifield.c    |    1 -
 drivers/pinctrl/intel/pinctrl-meteorlake.c    |    1 -
 drivers/pinctrl/intel/pinctrl-meteorpoint.c   |    1 -
 drivers/pinctrl/intel/pinctrl-moorefield.c    |    1 -
 drivers/pinctrl/intel/pinctrl-sunrisepoint.c  |    1 -
 drivers/pinctrl/intel/pinctrl-tigerlake.c     |    1 -
 .../pinctrl/microchip/pinctrl-mpfs-iomux0.c   |    1 -
 .../pinctrl/microchip/pinctrl-mpfs-mssio.c    |    1 -
 .../pinctrl/microchip/pinctrl-pic64gx-gpio2.c |    1 -
 drivers/pinctrl/nuvoton/pinctrl-ma35d1.c      |    1 -
 drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c     |    1 -
 drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c     |    1 -
 drivers/pinctrl/nuvoton/pinctrl-wpcm450.c     |    1 -
 drivers/pinctrl/pinctrl-as3722.c              |    1 -
 drivers/pinctrl/pinctrl-cy8c95x0.c            |    1 -
 drivers/pinctrl/pinctrl-da850-pupd.c          |    1 -
 drivers/pinctrl/pinctrl-digicolor.c           |    1 -
 drivers/pinctrl/pinctrl-eic7700.c             |    1 -
 drivers/pinctrl/pinctrl-eyeq5.c               |    1 -
 drivers/pinctrl/pinctrl-ingenic.c             |    1 -
 drivers/pinctrl/pinctrl-loongson2.c           |    1 -
 drivers/pinctrl/pinctrl-lpc18xx.c             |    1 -
 drivers/pinctrl/pinctrl-max77620.c            |    1 -
 drivers/pinctrl/pinctrl-mcp23s08.c            |    1 -
 drivers/pinctrl/pinctrl-mcp23s08_i2c.c        |    1 -
 drivers/pinctrl/pinctrl-mcp23s08_spi.c        |    1 -
 drivers/pinctrl/pinctrl-microchip-sgpio.c     |    1 -
 drivers/pinctrl/pinctrl-mlxbf3.c              |    1 -
 drivers/pinctrl/pinctrl-pistachio.c           |    1 -
 drivers/pinctrl/pinctrl-scmi.c                |    1 -
 drivers/pinctrl/pinctrl-th1520.c              |    1 -
 drivers/pinctrl/pinctrl-tps6594.c             |    1 -
 drivers/pinctrl/qcom/pinctrl-ipq5018.c        |    1 -
 drivers/pinctrl/spear/pinctrl-spear1310.c     |    1 -
 drivers/pinctrl/spear/pinctrl-spear1340.c     |    1 -
 drivers/pinctrl/spear/pinctrl-spear300.c      |    1 -
 drivers/pinctrl/spear/pinctrl-spear310.c      |    1 -
 drivers/pinctrl/spear/pinctrl-spear320.c      |    1 -
 drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c    |    1 -
 .../starfive/pinctrl-starfive-jh7100.c        |    1 -
 .../starfive/pinctrl-starfive-jh7110-aon.c    |    1 -
 .../starfive/pinctrl-starfive-jh7110-sys.c    |    1 -
 .../starfive/pinctrl-starfive-jh7110.c        |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra234.c      |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra238.c      |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra264.c      |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld11.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld20.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld4.c   |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld6b.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-nx1.c   |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pro4.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pro5.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pxs2.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pxs3.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-sld8.c  |    1 -
 drivers/platform/chrome/cros_ec_chardev.c     |    1 -
 drivers/platform/chrome/cros_ec_debugfs.c     |    1 -
 drivers/platform/chrome/cros_ec_lightbar.c    |    1 -
 drivers/platform/chrome/cros_ec_sensorhub.c   |    1 -
 drivers/platform/chrome/cros_ec_sysfs.c       |    1 -
 drivers/platform/chrome/cros_ec_vbc.c         |    1 -
 .../platform/chrome/cros_kbd_led_backlight.c  |    1 -
 drivers/platform/chrome/cros_usbpd_logger.c   |    1 -
 drivers/platform/chrome/cros_usbpd_notify.c   |    1 -
 drivers/platform/chrome/wilco_ec/core.c       |    1 -
 drivers/platform/chrome/wilco_ec/debugfs.c    |    1 -
 drivers/platform/chrome/wilco_ec/telemetry.c  |    1 -
 drivers/platform/goldfish/goldfish_pipe.c     |    1 -
 drivers/platform/x86/asus-tf103c-dock.c       |    1 -
 drivers/platform/x86/intel/atomisp2/led.c     |    1 -
 drivers/platform/x86/intel/atomisp2/pm.c      |    1 -
 drivers/platform/x86/intel/bxtwc_tmu.c        |    1 -
 drivers/platform/x86/intel/ehl_pse_io.c       |    1 -
 drivers/platform/x86/intel/plr_tpmi.c         |    1 -
 drivers/platform/x86/intel/punit_ipc.c        |    1 -
 drivers/platform/x86/intel_scu_pltdrv.c       |    1 -
 drivers/platform/x86/msi-ec.c                 |    1 +
 .../platform/x86/nvidia-wmi-ec-backlight.c    |    1 -
 drivers/platform/x86/quickstart.c             |    1 -
 drivers/platform/x86/uniwill/uniwill-wmi.c    |    1 -
 .../platform/x86/x86-android-tablets/dmi.c    |    1 -
 .../x86-android-tablets/x86-android-tablets.h |    1 +
 drivers/pmdomain/actions/owl-sps.c            |    1 -
 drivers/pmdomain/imx/imx93-pd.c               |    1 -
 .../marvell/pxa1908-power-controller.c        |    1 -
 drivers/pnp/pnpacpi/core.c                    |    1 -
 drivers/power/reset/brcm-kona-reset.c         |    1 -
 drivers/power/reset/ep93xx-restart.c          |    1 -
 drivers/power/reset/gpio-poweroff.c           |    1 -
 drivers/power/reset/ltc2952-poweroff.c        |    1 -
 drivers/power/reset/macsmc-reboot.c           |    1 -
 drivers/power/reset/ocelot-reset.c            |    1 -
 drivers/power/reset/pwr-mlxbf.c               |    1 -
 drivers/power/reset/qemu-virt-ctrl.c          |    1 -
 drivers/power/reset/sc27xx-poweroff.c         |    1 -
 drivers/power/reset/spacemit-p1-reboot.c      |    1 -
 drivers/power/reset/tdx-ec-poweroff.c         |    1 -
 drivers/power/reset/tps65086-restart.c        |    1 -
 drivers/power/sequencing/pwrseq-pcie-m2.c     |    1 -
 drivers/power/sequencing/pwrseq-qcom-wcn.c    |    1 -
 drivers/power/supply/adp5061.c                |    1 -
 drivers/power/supply/bd71828-power.c          |    1 -
 drivers/power/supply/bd99954-charger.c        |    1 -
 drivers/power/supply/bq24190_charger.c        |    1 -
 drivers/power/supply/chagall-battery.c        |    1 -
 drivers/power/supply/cpcap-charger.c          |    1 -
 drivers/power/supply/cros_charge-control.c    |    1 -
 .../power/supply/cros_peripheral_charger.c    |    1 -
 drivers/power/supply/cros_usbpd-charger.c     |    1 -
 drivers/power/supply/lego_ev3_battery.c       |    1 -
 .../power/supply/max14656_charger_detector.c  |    1 -
 drivers/power/supply/max17042_battery.c       |    1 -
 drivers/power/supply/max77759_charger.c       |    1 -
 drivers/power/supply/max8971_charger.c        |    1 -
 drivers/power/supply/max8998_charger.c        |    1 -
 drivers/power/supply/mp2629_charger.c         |    1 -
 drivers/power/supply/olpc_battery.c           |    1 -
 drivers/power/supply/pm8916_bms_vm.c          |    1 -
 drivers/power/supply/pm8916_lbc.c             |    1 -
 drivers/power/supply/rt5033_charger.c         |    1 -
 drivers/power/supply/rt9467-charger.c         |    1 -
 drivers/power/supply/rt9471.c                 |    1 -
 drivers/power/supply/rt9756.c                 |    1 -
 drivers/power/supply/s2mu005-battery.c        |    1 -
 drivers/power/supply/ug3105_battery.c         |    1 -
 drivers/pps/clients/pps-gpio.c                |    1 -
 drivers/pps/generators/pps_gen_tio.c          |    1 -
 drivers/ptp/ptp_dte.c                         |    1 -
 drivers/pwm/pwm-adp5585.c                     |    1 -
 drivers/pwm/pwm-airoha.c                      |    1 -
 drivers/pwm/pwm-apple.c                       |    1 -
 drivers/pwm/pwm-berlin.c                      |    1 -
 drivers/pwm/pwm-ep93xx.c                      |    1 -
 drivers/pwm/pwm-gpio.c                        |    1 -
 drivers/pwm/pwm-intel-lgm.c                   |    1 -
 drivers/pwm/pwm-keembay.c                     |    1 -
 drivers/pwm/pwm-lpc18xx-sct.c                 |    1 -
 drivers/pwm/pwm-lpss-platform.c               |    1 -
 drivers/pwm/pwm-max7360.c                     |    1 -
 drivers/pwm/pwm-pxa.c                         |    1 -
 drivers/pwm/pwm-sifive.c                      |    1 -
 drivers/pwm/pwm-sl28cpld.c                    |    1 -
 drivers/pwm/pwm-sprd.c                        |    1 -
 drivers/pwm/pwm-sunplus.c                     |    1 -
 drivers/pwm/pwm-vt8500.c                      |    1 -
 drivers/regulator/adp5055-regulator.c         |    1 -
 drivers/regulator/bd71828-regulator.c         |    1 -
 drivers/regulator/max77541-regulator.c        |    1 -
 drivers/regulator/max77675-regulator.c        |    1 -
 drivers/regulator/mt6370-regulator.c          |    1 -
 drivers/regulator/pv88080-regulator.c         |    1 -
 drivers/regulator/rt4803.c                    |    1 -
 drivers/regulator/rt5739.c                    |    1 -
 drivers/regulator/rt6190-regulator.c          |    1 -
 drivers/regulator/rt8092.c                    |    1 -
 drivers/regulator/rtq2208-regulator.c         |    1 -
 drivers/regulator/tps6287x-regulator.c        |    1 -
 drivers/regulator/tps65218-regulator.c        |    1 -
 drivers/regulator/tps65912-regulator.c        |    1 -
 drivers/regulator/vexpress-regulator.c        |    1 -
 drivers/reset/reset-ath79.c                   |    1 -
 drivers/reset/reset-axs10x.c                  |    1 -
 drivers/reset/reset-bcm6345.c                 |    1 -
 drivers/reset/reset-eyeq.c                    |    1 -
 drivers/reset/reset-gpio.c                    |    1 -
 drivers/reset/reset-sunplus.c                 |    1 -
 drivers/reset/reset-tn48m.c                   |    1 -
 .../reset/starfive/reset-starfive-jh7100.c    |    1 -
 drivers/rtc/rtc-88pm886.c                     |    1 -
 drivers/rtc/rtc-cpcap.c                       |    1 -
 drivers/rtc/rtc-cros-ec.c                     |    1 -
 drivers/rtc/rtc-ds1307.c                      |    1 -
 drivers/rtc/rtc-ep93xx.c                      |    1 -
 drivers/rtc/rtc-fsl-ftm-alarm.c               |    1 -
 drivers/rtc/rtc-ftrtc010.c                    |    1 -
 drivers/rtc/rtc-lpc24xx.c                     |    1 -
 drivers/rtc/rtc-m48t86.c                      |    1 -
 drivers/rtc/rtc-mc13xxx.c                     |    1 -
 drivers/rtc/rtc-moxart.c                      |    1 -
 drivers/rtc/rtc-msc313.c                      |    1 -
 drivers/rtc/rtc-mt6397.c                      |    1 -
 drivers/rtc/rtc-mt7622.c                      |    1 -
 drivers/rtc/rtc-mxc_v2.c                      |    1 -
 drivers/rtc/rtc-r7301.c                       |    1 -
 drivers/rtc/rtc-rzn1.c                        |    1 -
 drivers/rtc/rtc-sh.c                          |    1 -
 drivers/rtc/rtc-ssd202d.c                     |    1 -
 drivers/rtc/rtc-tegra.c                       |    1 -
 drivers/rtc/rtc-ti-k3.c                       |    1 -
 drivers/rtc/rtc-tps6594.c                     |    1 -
 drivers/s390/crypto/ap_bus.c                  |    2 +-
 drivers/s390/crypto/vfio_ap_drv.c             |    2 +-
 drivers/s390/crypto/zcrypt_cex4.c             |    2 +-
 drivers/siox/siox-bus-gpio.c                  |    1 -
 drivers/soc/fsl/qe/qe.c                       |    1 -
 drivers/soc/qcom/qcom_pd_mapper.c             |    1 -
 drivers/soc/renesas/rzn1_irqmux.c             |    1 -
 drivers/soc/sophgo/sg2044-topsys.c            |    2 +-
 drivers/soc/tegra/fuse/fuse-tegra.c           |    1 -
 drivers/soc/tegra/fuse/tegra-apbmisc.c        |    1 -
 drivers/soc/ti/smartreflex.c                  |    2 +-
 drivers/soundwire/bus.c                       |    1 -
 drivers/soundwire/bus_type.c                  |    1 -
 drivers/soundwire/cadence_master.c            |    1 -
 drivers/soundwire/debugfs.c                   |    1 -
 .../soundwire/generic_bandwidth_allocation.c  |    1 -
 drivers/soundwire/mipi_disco.c                |    1 -
 drivers/soundwire/stream.c                    |    1 -
 drivers/soundwire/sysfs_slave.c               |    1 -
 drivers/soundwire/sysfs_slave_dpn.c           |    1 -
 drivers/spi/spi-atcspi200.c                   |    1 -
 drivers/spi/spi-cs42l43.c                     |    1 -
 drivers/spi/spi-gpio.c                        |    1 -
 drivers/spi/spi-hisi-sfc-v3xx.c               |    1 -
 drivers/spi/spi-loongson-pci.c                |    1 -
 drivers/spi/spi-loongson-plat.c               |    1 -
 drivers/spi/spi-loopback-test.c               |    1 -
 ...spi-offload-trigger-adi-util-sigma-delta.c |    1 -
 drivers/spi/spi-offload-trigger-pwm.c         |    1 -
 drivers/spi/spi-pxa2xx-platform.c             |    1 -
 drivers/spi/spi-realtek-rtl-snand.c           |    1 -
 drivers/spi/spi-realtek-rtl.c                 |    1 -
 drivers/spi/spi-sc18is602.c                   |    1 -
 drivers/spi/spi-wpcm-fiu.c                    |    1 -
 drivers/spi/spi.c                             |    1 -
 drivers/spi/spidev.c                          |    1 -
 drivers/spmi/spmi-apple-controller.c          |    1 -
 drivers/staging/greybus/arche-apb-ctrl.c      |    1 -
 drivers/thermal/loongson2_thermal.c           |    1 -
 drivers/thermal/renesas/rzg2l_thermal.c       |    1 -
 drivers/tty/goldfish.c                        |    1 -
 drivers/tty/serial/8250/8250_dfl.c            |    1 -
 drivers/tty/serial/8250/8250_dw.c             |    1 -
 drivers/tty/serial/8250/8250_em.c             |    1 -
 drivers/tty/serial/8250/8250_keba.c           |    1 -
 drivers/tty/serial/8250/8250_loongson.c       |    1 -
 drivers/tty/serial/8250/8250_ni.c             |    1 -
 drivers/tty/serial/max3100.c                  |    1 -
 drivers/tty/serial/max310x.c                  |    1 -
 drivers/tty/serial/sc16is7xx.c                |    1 -
 drivers/tty/serial/sc16is7xx_i2c.c            |    1 -
 drivers/tty/serial/sc16is7xx_spi.c            |    1 -
 drivers/tty/serial/sccnxp.c                   |    1 -
 drivers/tty/serial/tegra-utc.c                |    1 -
 drivers/uio/uio_pdrv_genirq.c                 |    1 -
 drivers/usb/dwc2/core.h                       |    1 +
 drivers/usb/gadget/udc/renesas_usbf.c         |    1 -
 drivers/usb/misc/usb-ljca.c                   |    1 -
 drivers/usb/typec/mux/tusb1046.c              |    1 -
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c |    1 -
 .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.c   |    1 -
 .../tcpm/qcom/qcom_pmic_typec_pdphy_stub.c    |    1 -
 .../typec/tcpm/qcom/qcom_pmic_typec_port.c    |    1 -
 drivers/usb/typec/tcpm/tcpci_mt6370.c         |    1 -
 drivers/usb/typec/tcpm/tcpci_rt1711h.c        |    1 -
 drivers/usb/typec/ucsi/cros_ec_ucsi.c         |    1 -
 drivers/vdpa/vdpa.c                           |    1 -
 drivers/vdpa/vdpa_user/vduse_dev.c            |    1 -
 drivers/video/backlight/apple_dwi_bl.c        |    1 -
 drivers/video/backlight/da9052_bl.c           |    1 -
 drivers/video/backlight/hx8357.c              |    1 -
 drivers/video/backlight/ktd2801-backlight.c   |    1 -
 drivers/video/backlight/mp3309c.c             |    1 -
 drivers/video/backlight/mt6370-backlight.c    |    1 -
 drivers/video/backlight/rave-sp-backlight.c   |    1 -
 drivers/video/backlight/rt4831-backlight.c    |    1 -
 .../omap2/omapfb/displays/encoder-opa362.c    |    1 -
 .../omap2/omapfb/displays/encoder-tfp410.c    |    1 -
 .../omap2/omapfb/displays/encoder-tpd12s015.c |    1 -
 .../omap2/omapfb/displays/panel-dsi-cm.c      |    1 -
 .../virt/coco/arm-cca-guest/arm-cca-guest.c   |    2 +-
 drivers/virt/coco/tdx-guest/tdx-guest.c       |    1 -
 drivers/virt/coco/tdx-host/tdx-host.c         |    1 -
 drivers/w1/masters/amd_axi_w1.c               |    1 -
 drivers/w1/masters/ds2490.c                   |    1 -
 drivers/w1/masters/mxc_w1.c                   |    1 -
 drivers/w1/masters/sgi_w1.c                   |    1 -
 drivers/w1/masters/w1-gpio.c                  |    1 -
 drivers/watchdog/at91rm9200_wdt.c             |    1 -
 drivers/watchdog/cros_ec_wdt.c                |    1 -
 drivers/watchdog/davinci_wdt.c                |    1 -
 drivers/watchdog/ftwdt010_wdt.c               |    1 -
 drivers/watchdog/gpio_wdt.c                   |    1 -
 drivers/watchdog/gunyah_wdt.c                 |    1 -
 drivers/watchdog/imgpdc_wdt.c                 |    1 -
 drivers/watchdog/keembay_wdt.c                |    1 -
 drivers/watchdog/max63xx_wdt.c                |    1 -
 drivers/watchdog/max77620_wdt.c               |    1 -
 drivers/watchdog/meson_wdt.c                  |    1 -
 drivers/watchdog/moxart_wdt.c                 |    1 -
 drivers/watchdog/msc313e_wdt.c                |    1 -
 drivers/watchdog/mt7621_wdt.c                 |    1 -
 drivers/watchdog/nic7018_wdt.c                |    1 -
 drivers/watchdog/omap_wdt.c                   |    1 -
 drivers/watchdog/pseries-wdt.c                |    1 -
 drivers/watchdog/realtek_otto_wdt.c           |    1 -
 drivers/watchdog/rt2880_wdt.c                 |    1 -
 drivers/watchdog/rti_wdt.c                    |    1 -
 drivers/watchdog/sbsa_gwdt.c                  |    1 -
 drivers/watchdog/sl28cpld_wdt.c               |    1 -
 drivers/watchdog/sunplus_wdt.c                |    1 -
 drivers/watchdog/ts72xx_wdt.c                 |    1 -
 drivers/watchdog/twl4030_wdt.c                |    1 -
 drivers/watchdog/xilinx_wwdt.c                |    1 -
 include/linux/acpi.h                          |    2 +-
 include/linux/amba/bus.h                      |    2 +-
 include/linux/auxiliary_bus.h                 |    2 +-
 include/linux/bcma/bcma.h                     |    2 +-
 include/linux/cdx/cdx_bus.h                   |    2 +-
 include/linux/device/driver.h                 |    2 +
 include/linux/dfl.h                           |    2 +-
 include/linux/dmi.h                           |    2 +-
 include/linux/eisa.h                          |    2 +-
 include/linux/firewire.h                      |    3 +-
 include/linux/fsl/mc.h                        |    2 +-
 include/linux/hid.h                           |    2 +-
 include/linux/hyperv.h                        |    2 +-
 include/linux/i2c.h                           |    2 +-
 include/linux/i3c/device.h                    |    2 +-
 include/linux/input.h                         |    2 +-
 include/linux/intel-ish-client-if.h           |    2 +-
 include/linux/ipack.h                         |    2 +-
 include/linux/isapnp.h                        |    2 +-
 include/linux/mcb.h                           |    2 +-
 include/linux/mei_cl_bus.h                    |    2 +-
 include/linux/mhi.h                           |    1 +
 include/linux/mmc/sdio_func.h                 |    2 +-
 include/linux/mod_device_id/acpi.h            |   31 +
 include/linux/mod_device_id/amba.h            |   18 +
 include/linux/mod_device_id/ap.h              |   19 +
 include/linux/mod_device_id/apr.h             |   20 +
 include/linux/mod_device_id/auxiliary.h       |   16 +
 include/linux/mod_device_id/bcma.h            |   24 +
 include/linux/mod_device_id/ccw.h             |   26 +
 include/linux/mod_device_id/cdx.h             |   39 +
 include/linux/mod_device_id/coreboot.h        |   19 +
 include/linux/mod_device_id/css.h             |   16 +
 include/linux/mod_device_id/dfl.h             |   33 +
 include/linux/mod_device_id/dmi.h             |   57 +
 include/linux/mod_device_id/eisa.h            |   20 +
 include/linux/mod_device_id/fsl_mc.h          |   21 +
 include/linux/mod_device_id/hda.h             |   16 +
 include/linux/mod_device_id/hid.h             |   21 +
 include/linux/mod_device_id/hv_vmbus.h        |   17 +
 include/linux/mod_device_id/i2c.h             |   18 +
 include/linux/mod_device_id/i3c.h             |   25 +
 include/linux/mod_device_id/ieee1394.h        |   26 +
 include/linux/mod_device_id/input.h           |   61 +
 include/linux/mod_device_id/ipack.h           |   16 +
 include/linux/mod_device_id/isapnp.h          |   15 +
 include/linux/mod_device_id/ishtp.h           |   23 +
 include/linux/mod_device_id/mcb.h             |   14 +
 include/linux/mod_device_id/mdio.h            |   34 +
 include/linux/mod_device_id/mei_cl.h          |   30 +
 include/linux/mod_device_id/mhi.h             |   23 +
 include/linux/mod_device_id/mips_cdmm.h       |   16 +
 include/linux/mod_device_id/of.h              |   14 +
 include/linux/mod_device_id/parisc.h          |   20 +
 include/linux/mod_device_id/pci.h             |   53 +
 include/linux/mod_device_id/pcmcia.h          |   47 +
 include/linux/mod_device_id/platform.h        |   16 +
 include/linux/mod_device_id/pnp.h             |   25 +
 include/linux/mod_device_id/rio.h             |   27 +
 include/linux/mod_device_id/rpmsg.h           |   18 +
 include/linux/mod_device_id/sdio.h            |   20 +
 include/linux/mod_device_id/sdw.h             |   17 +
 include/linux/mod_device_id/serio.h           |   17 +
 include/linux/mod_device_id/slim.h            |   22 +
 include/linux/mod_device_id/spi.h             |   18 +
 include/linux/mod_device_id/spmi.h            |   16 +
 include/linux/mod_device_id/ssam.h            |   27 +
 include/linux/mod_device_id/ssb.h             |   23 +
 include/linux/mod_device_id/tb.h              |   36 +
 include/linux/mod_device_id/tee_client.h      |   17 +
 include/linux/mod_device_id/typec.h           |   25 +
 include/linux/mod_device_id/ulpi.h            |   15 +
 include/linux/mod_device_id/usb.h             |  110 ++
 include/linux/mod_device_id/vchiq.h           |    8 +
 include/linux/mod_device_id/vio.h             |   10 +
 include/linux/mod_device_id/virtio.h          |   15 +
 include/linux/mod_device_id/wmi.h             |   18 +
 include/linux/mod_device_id/x86_cpu.h         |   43 +
 include/linux/mod_device_id/zorro.h           |   18 +
 include/linux/mod_devicetable.h               | 1014 +----------------
 include/linux/of.h                            |    2 +-
 include/linux/of_platform.h                   |    4 +-
 include/linux/pci-epf.h                       |    2 +-
 include/linux/pci.h                           |    2 +-
 include/linux/phy.h                           |    2 +-
 include/linux/platform_data/x86/int3472.h     |    2 +-
 include/linux/platform_data/x86/soc.h         |    2 +-
 include/linux/platform_device.h               |    2 +-
 include/linux/pnp.h                           |    2 +-
 include/linux/raspberrypi/vchiq_bus.h         |    2 +-
 include/linux/rio.h                           |    2 +-
 include/linux/rpmsg.h                         |    2 +-
 include/linux/serio.h                         |    2 +-
 include/linux/slimbus.h                       |    2 +-
 include/linux/soc/qcom/apr.h                  |    2 +-
 include/linux/soundwire/sdw.h                 |    2 +-
 include/linux/spi/spi.h                       |    4 +-
 include/linux/ssb/ssb.h                       |    2 +-
 include/linux/surface_aggregator/device.h     |    2 +-
 include/linux/tee_drv.h                       |    2 +-
 include/linux/thunderbolt.h                   |    2 +-
 include/linux/ulpi/driver.h                   |    2 +-
 include/linux/usb.h                           |    2 +-
 include/linux/usb/serial.h                    |    1 +
 include/linux/usb/typec_altmode.h             |    2 +-
 include/linux/virtio.h                        |    2 +-
 include/linux/wmi.h                           |    2 +-
 include/linux/zorro.h                         |    2 +-
 include/pcmcia/ds.h                           |    2 +-
 include/sound/hda_codec.h                     |    2 +-
 include/sound/hdaudio.h                       |    1 +
 net/qrtr/mhi.c                                |    1 -
 net/rfkill/rfkill-gpio.c                      |    1 -
 sound/atmel/ac97c.c                           |    1 -
 sound/firewire/isight.c                       |    1 -
 .../hda/codecs/side-codecs/cs35l41_hda_i2c.c  |    1 -
 .../hda/codecs/side-codecs/cs35l41_hda_spi.c  |    1 -
 .../hda/codecs/side-codecs/tas2781_hda_i2c.c  |    1 -
 .../hda/codecs/side-codecs/tas2781_hda_spi.c  |    1 -
 sound/hda/core/hda_bus_type.c                 |    2 +-
 sound/soc/atmel/sam9x5_wm8731.c               |    1 -
 sound/soc/codecs/adau1372-i2c.c               |    1 -
 sound/soc/codecs/adau1372-spi.c               |    1 -
 sound/soc/codecs/adau1372.c                   |    1 -
 sound/soc/codecs/adau1761-i2c.c               |    1 -
 sound/soc/codecs/adau1761-spi.c               |    1 -
 sound/soc/codecs/adau1781-i2c.c               |    1 -
 sound/soc/codecs/adau1781-spi.c               |    1 -
 sound/soc/codecs/adau1977-i2c.c               |    1 -
 sound/soc/codecs/adau1977-spi.c               |    1 -
 sound/soc/codecs/adau7118-hw.c                |    1 -
 sound/soc/codecs/ak4104.c                     |    1 -
 sound/soc/codecs/audio-iio-aux.c              |    1 -
 sound/soc/codecs/cs4234.c                     |    1 -
 sound/soc/codecs/cs4270.c                     |    1 -
 sound/soc/codecs/cs42l42-sdw.c                |    1 -
 sound/soc/codecs/cs42l43.c                    |    1 -
 sound/soc/codecs/cs42xx8-i2c.c                |    1 -
 sound/soc/codecs/cs42xx8-spi.c                |    1 -
 sound/soc/codecs/cs4349.c                     |    1 -
 sound/soc/codecs/es8316.c                     |    1 -
 sound/soc/codecs/es8323.c                     |    1 -
 sound/soc/codecs/es9356.c                     |    1 -
 sound/soc/codecs/max98357a.c                  |    1 -
 sound/soc/codecs/max98373-i2c.c               |    1 -
 sound/soc/codecs/max98373-sdw.c               |    1 -
 sound/soc/codecs/max98388.c                   |    1 -
 sound/soc/codecs/mt6351.c                     |    1 -
 sound/soc/codecs/mt6358.c                     |    1 -
 sound/soc/codecs/pcm3168a-i2c.c               |    1 -
 sound/soc/codecs/rt1017-sdca-sdw.c            |    1 -
 sound/soc/codecs/rt1308-sdw.c                 |    1 -
 sound/soc/codecs/rt1316-sdw.c                 |    1 -
 sound/soc/codecs/rt1318-sdw.c                 |    1 -
 sound/soc/codecs/rt1320-sdw.c                 |    1 -
 sound/soc/codecs/rt700-sdw.c                  |    1 -
 sound/soc/codecs/rt711-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt711-sdw.c                  |    1 -
 sound/soc/codecs/rt712-sdca-dmic.c            |    1 -
 sound/soc/codecs/rt712-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt715-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt715-sdw.c                  |    1 -
 sound/soc/codecs/rt721-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt722-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt9123.c                     |    1 -
 sound/soc/codecs/rt9123p.c                    |    1 -
 sound/soc/codecs/rtq9124.c                    |    1 -
 sound/soc/codecs/rtq9128.c                    |    1 -
 sound/soc/codecs/sdw-mockup.c                 |    1 -
 sound/soc/codecs/simple-amplifier.c           |    1 -
 sound/soc/codecs/sma1303.c                    |    1 -
 sound/soc/codecs/src4xxx-i2c.c                |    1 -
 sound/soc/codecs/uda1334.c                    |    1 -
 sound/soc/codecs/wm8510.c                     |    1 -
 sound/soc/codecs/wm8523.c                     |    1 -
 sound/soc/codecs/wm8524.c                     |    1 -
 sound/soc/codecs/wm8580.c                     |    1 -
 sound/soc/codecs/wm8711.c                     |    1 -
 sound/soc/codecs/wm8728.c                     |    1 -
 sound/soc/codecs/wm8731-i2c.c                 |    1 -
 sound/soc/codecs/wm8731-spi.c                 |    1 -
 sound/soc/codecs/wm8737.c                     |    1 -
 sound/soc/codecs/wm8753.c                     |    1 -
 sound/soc/codecs/wm8770.c                     |    1 -
 sound/soc/codecs/wm8776.c                     |    1 -
 sound/soc/fsl/fsl_aud2htx.c                   |    1 -
 sound/soc/fsl/mpc5200_psc_ac97.c              |    1 -
 .../generic/audio-graph-card2-custom-sample.c |    1 -
 sound/soc/jz4740/jz4740-i2s.c                 |    1 -
 sound/soc/mediatek/mt8365/mt8365-mt6357.c     |    1 -
 sound/soc/qcom/apq8096.c                      |    1 -
 sound/soc/qcom/sc7280.c                       |    1 -
 sound/soc/qcom/storm.c                        |    1 -
 sound/soc/rockchip/rockchip_sai.c             |    1 +
 sound/soc/sdca/sdca_class.c                   |    1 -
 sound/soc/sof/sof-client-ipc-flood-test.c     |    1 -
 .../soc/sof/sof-client-ipc-kernel-injector.c  |    1 -
 sound/soc/sof/sof-client-ipc-msg-injector.c   |    1 -
 sound/soc/sunxi/sun50i-codec-analog.c         |    1 -
 sound/soc/sunxi/sun50i-dmic.c                 |    1 -
 sound/soc/tegra/tegra186_asrc.c               |    1 -
 sound/soc/tegra/tegra186_dspk.c               |    1 -
 sound/soc/tegra/tegra20_spdif.c               |    1 -
 sound/soc/tegra/tegra210_adx.c                |    1 -
 sound/soc/tegra/tegra210_amx.c                |    1 -
 sound/soc/tegra/tegra210_dmic.c               |    1 -
 sound/soc/tegra/tegra210_i2s.c                |    1 -
 sound/soc/tegra/tegra210_mixer.c              |    1 -
 sound/soc/tegra/tegra210_mvc.c                |    1 -
 sound/soc/tegra/tegra210_ope.c                |    1 -
 sound/soc/ti/omap-dmic.c                      |    1 -
 sound/soc/ti/omap-mcpdm.c                     |    1 -
 tools/testing/cxl/test/mem.c                  |    1 -
 1633 files changed, 1576 insertions(+), 2527 deletions(-)
 create mode 100644 include/linux/mod_device_id/acpi.h
 create mode 100644 include/linux/mod_device_id/amba.h
 create mode 100644 include/linux/mod_device_id/ap.h
 create mode 100644 include/linux/mod_device_id/apr.h
 create mode 100644 include/linux/mod_device_id/auxiliary.h
 create mode 100644 include/linux/mod_device_id/bcma.h
 create mode 100644 include/linux/mod_device_id/ccw.h
 create mode 100644 include/linux/mod_device_id/cdx.h
 create mode 100644 include/linux/mod_device_id/coreboot.h
 create mode 100644 include/linux/mod_device_id/css.h
 create mode 100644 include/linux/mod_device_id/dfl.h
 create mode 100644 include/linux/mod_device_id/dmi.h
 create mode 100644 include/linux/mod_device_id/eisa.h
 create mode 100644 include/linux/mod_device_id/fsl_mc.h
 create mode 100644 include/linux/mod_device_id/hda.h
 create mode 100644 include/linux/mod_device_id/hid.h
 create mode 100644 include/linux/mod_device_id/hv_vmbus.h
 create mode 100644 include/linux/mod_device_id/i2c.h
 create mode 100644 include/linux/mod_device_id/i3c.h
 create mode 100644 include/linux/mod_device_id/ieee1394.h
 create mode 100644 include/linux/mod_device_id/input.h
 create mode 100644 include/linux/mod_device_id/ipack.h
 create mode 100644 include/linux/mod_device_id/isapnp.h
 create mode 100644 include/linux/mod_device_id/ishtp.h
 create mode 100644 include/linux/mod_device_id/mcb.h
 create mode 100644 include/linux/mod_device_id/mdio.h
 create mode 100644 include/linux/mod_device_id/mei_cl.h
 create mode 100644 include/linux/mod_device_id/mhi.h
 create mode 100644 include/linux/mod_device_id/mips_cdmm.h
 create mode 100644 include/linux/mod_device_id/of.h
 create mode 100644 include/linux/mod_device_id/parisc.h
 create mode 100644 include/linux/mod_device_id/pci.h
 create mode 100644 include/linux/mod_device_id/pcmcia.h
 create mode 100644 include/linux/mod_device_id/platform.h
 create mode 100644 include/linux/mod_device_id/pnp.h
 create mode 100644 include/linux/mod_device_id/rio.h
 create mode 100644 include/linux/mod_device_id/rpmsg.h
 create mode 100644 include/linux/mod_device_id/sdio.h
 create mode 100644 include/linux/mod_device_id/sdw.h
 create mode 100644 include/linux/mod_device_id/serio.h
 create mode 100644 include/linux/mod_device_id/slim.h
 create mode 100644 include/linux/mod_device_id/spi.h
 create mode 100644 include/linux/mod_device_id/spmi.h
 create mode 100644 include/linux/mod_device_id/ssam.h
 create mode 100644 include/linux/mod_device_id/ssb.h
 create mode 100644 include/linux/mod_device_id/tb.h
 create mode 100644 include/linux/mod_device_id/tee_client.h
 create mode 100644 include/linux/mod_device_id/typec.h
 create mode 100644 include/linux/mod_device_id/ulpi.h
 create mode 100644 include/linux/mod_device_id/usb.h
 create mode 100644 include/linux/mod_device_id/vchiq.h
 create mode 100644 include/linux/mod_device_id/vio.h
 create mode 100644 include/linux/mod_device_id/virtio.h
 create mode 100644 include/linux/mod_device_id/wmi.h
 create mode 100644 include/linux/mod_device_id/x86_cpu.h
 create mode 100644 include/linux/mod_device_id/zorro.h

base-commit: ef0c9f75a19532d7675384708fc8621e10850104
-- 
2.47.3


^ permalink raw reply	[flat|nested] 26+ messages in thread

* [PATCH v2 00/17] mod_devicetable.h: Split into per subsystem headers
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  0 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman, Mark Brown
  Cc: Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	Raag Jadav, Sohil Mehta, Dave Hansen, Rob Herring,
	Saravana Kannan, Bjorn Helgaas, Rafael J. Wysocki, Len Brown,
	Andi Shyti, linux-kernel, Yemike Abhilash Chandra,
	Mauro Carvalho Chehab, linux-media, Nicolas Frattaroli,
	Liam Girdwood, Jaroslav Kysela, Takashi Iwai, Heiko Stuebner,
	linux-rockchip, linux-sound, linux-arm-kernel, Danilo Krummrich,
	driver-core, Jonathan Cameron, Dmitry Torokhov,
	Bartosz Golaszewski, Pei Xiao, Shashank Balaji, Ben Horgan,
	Johan Hovold, linux-usb, Nikita Kravets, Hans de Goede,
	Ilpo Järvinen, platform-driver-x86, devicetree, linux-i2c,
	Daniel Scally, Sakari Ailus, Minas Harutyunyan, Tianrui Zhao,
	Bibo Mao, Huacai Chen, WANG Xuerui, kvm, loongarch

Hello,

this is v2 of
https://lore.kernel.org/lkml/20260622210733.1743063-2-u.kleine-koenig@baylibre.com
which only consisted of the patch that is the first in this series.
Changes to this first patch are mostly cosmetic (whitespace cleanups)
and I renamed tee.h to tee_client.h to match tee_client_device_id.

The following 14 patches are preparations for patch #16 that replaces
the include of <linux/mod_devicetable.h> in several key header files by
a subset of the split headers that are needed for these. As there are
some drivers that rely on e.g. <linux/i2c.h> pulling in the definition
for usb_device_id, these must be prepared before <linux/i2c.h> stops
providing this definition.

patch #17 adapts various .c files to stop including
<linux/mod_devicetable.h>. These are easier as the device_ids that have
to be provided are only those used in that .c file. This last patch was
created by the Python script below. That also checks if the needed
headers are present for the files that don't explicitly include
<linux/mod_devicetable.h>. There are 131 files where the script was
unable to prove the includes to be sufficient. Most of them are covered
by build testing, the few remaining ones (12 .c files, 36 headers) were
checked semi-manually.

This series was compile tested for alpha, arc, arm64, loongarch, m68k,
mips, powerpc, riscv, s390, sh, sparc, and x86_64 using an allmodconfig
configuration. 

There are a few remaining usages of <linux/mod_devicetable.h>, I plan to
tackle them for the next merge window. These also shouldn't affect so
many files any more and so these changes will annoy less (i.e. result in
less recompilation during bisection and/or development).

Preparing this series took me longer than I hoped, so it's too late to
get it into next before -rc1. I will push this series to

	https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git device-id-rework

Given that there are a few merge conflicts with what is in Linus's tree
in the meantime, my plan is to rebase this branch to v7.2-rc1, retest
and then hopefully consider it ready for v7.2-rc2 after cooking in next
for a few days. This has the advantage that hardly any new conflicts
should get introduced in Linus's tree then.

Sounds like a sensible plan?

@Mark: I hope to have the rebase ready before you start working on
next-20260629. If not, just drop this branch from your list for this
day.

Best regards
Uwe

------->8--------
#!/usr/bin/env python3

import re
import os

# Maps a struct name to a set of headers that are enough to provide that struct.
symbol_header_map = {
        'acpi_device_id': (
            'linux/mod_device_id/acpi.h',
            'linux/acpi.h',                         # includes <linux/mod_devicetable.h>
            'linux/i2c.h',                          # includes <linux/acpi.h>
            'linux/device.h',                       # includes <linux/device/driver.h> which includes linux/mod_device_id/acpi.h
            'linux/spi/spi.h',                      # includes <linux/device.h>
            'linux/backlight.h',                    # includes <linux/device.h>
            'linux/pci.h',                          # includes <linux/device.h>
            'linux/platform_device.h',              # includes <linux/device.h>
            'linux/auxiliary_bus.h',                # includes <linux/device.h>
            'sound/soc.h',                          # includes <linux/platform_device.h>
            'sound/sof.h',                          # includes <linux/device.h>
            ),
        'amba_id': (
            'linux/mod_device_id/amba.h',
            'linux/amba/bus.h',                     # includes <linux/mod_devicetable.h>
            ),
        'ap_device_id': (
            'linux/mod_device_id/ap.h',
            ),
        'apr_device_id': (
            'linux/mod_device_id/apr.h',
            'linux/soc/qcom/apr.h',                 # includes <linux/mod_devicetable.h>
            ),
        'auxiliary_device_id': (
            'linux/mod_device_id/auxiliary.h',
            'linux/auxiliary_bus.h',                # includes <linux/mod_devicetable.h>
            'linux/misc/keba.h',                    # includes <linux/auxiliary_bus.h>
            'linux/mlx4/driver.h',                  # includes <linux/auxiliary_bus.h>
            'linux/soc/cirrus/ep93xx.h',            # includes <linux/auxiliary_bus.h>
            ),
        'bcma_device_id': (
            'linux/mod_device_id/bcma.h',
            'linux/bcma/bcma.h',                    # includes <linux/mod_devicetable.h>
            ),
        'ccw_device_id': (
            'linux/mod_device_id/ccw.h',
            'asm/ccwdev.h',                         # includes <linux/mod_devicetable.h>
            ),
        'cdx_device_id': (
            'linux/mod_device_id/cdx.h',
            'linux/cdx/cdx_bus.h',                  # includes <linux/mod_devicetable.h>
            ),
        'coreboot_device_id': (
            'linux/mod_device_id/coreboot.h',
            ),
        'css_device_id': (
            'linux/mod_device_id/css.h',
            'css.h',
            ),
        'dfl_device_id': (
            'linux/mod_device_id/dfl.h',
            'linux/dfl.h',                          # includes <linux/mod_devicetable.h>
            ),
        'dmi_(device|system)_id': (
            'linux/mod_device_id/dmi.h',
            'linux/dmi.h',                          # includes <linux/mod_devicetable.h>
            ),
        'eisa_device_id': (
            'linux/mod_device_id/eisa.h',
            'linux/eisa.h',                         # includes <linux/mod_devicetable.h>
            ),
        'fsl_mc_device_id': (
            'linux/mod_device_id/fsl_mc.h',
            'linux/fsl/mc.h',                       # includes <linux/mod_devicetable.h>
            ),
        'hda_device_id': (
            'linux/mod_device_id/hda.h',
            'sound/hda_codec.h',                    # includes <linux/mod_devicetable.h>
            ),
        'hid_device_id': (
            'linux/mod_device_id/hid.h',
            'linux/hid.h',                          # includes <linux/mod_devicetable.h>
            'linux/hidraw.h',                       # includes <linux/hid.h> transitively
            ),
        'hv_vmbus_device_id': (
            'linux/mod_device_id/hv_vmbus.h',
            'linux/hyperv.h',                       # includes linux/mod_devicetable.h>
            'hyperv_net.h',                         # includes linux/hyperv.h
            ),
        'i2c_device_id': (
            'linux/mod_device_id/i2c.h',
            'linux/i2c.h',                          # includes <linux/mod_devicetable.h>
            'linux/mfd/lp873x.h',                   # includes <linux/i2c.h>
            'media/dvb_frontend.h',                 # includes <linux/i2c.h>
            ),
        'i3c_device_id': (
            'linux/mod_device_id/i3c.h',
            'linux/i3c/device.h',                   # includes <linux/mod_devicetable.h>
            'linux/i3c/master.h',                   # includes <linux/i3c/device.h>
            ),
        'ieee1394_device_id': (
            'linux/mod_device_id/ieee1394.h',
            'linux/firewire.h',                     # should include <linux/mod_device_id/ieee1394.h>, instead of fwd decl
            ),
        'input_device_id': (
            'linux/mod_device_id/input.h',
            'linux/input.h',                        # includes <linux/mod_devicetable.h>
            ),
        'ipack_device_id': (
            'linux/mod_device_id/ipack.h',
            'linux/ipack.h',                        # includes <linux/mod_devicetable.h>
            ),
        'isapnp_device_id': (
            'linux/mod_device_id/isapnp.h',
            'linux/isapnp.h',                       # includes <linux/mod_devicetable.h>
            ),
        'ishtp_device_id': (
            'linux/mod_device_id/ishtp.h',
            'linux/intel-ish-client-if.h',          # includes <linux/mod_devicetable.h>
            ),
        'mcb_device_id': (
            'linux/mod_device_id/mcb.h',
            'linux/mcb.h',                          # includes <linux/mod_devicetable.h>
            ),
        'mdio_device_id': (
            'linux/mod_device_id/mdio.h',
            'linux/phy.h',                          # includes <linux/mod_devicetable.h>
            ),
        'mei_cl_device_id': (
            'linux/mod_device_id/mei_cl.h',
            'linux/mei_cl_bus.h',                   # includes <linux/mod_devicetable.h>
            ),
        'mhi_device_id': (
            'linux/mod_device_id/mhi.h',
            'linux/mhi.h',                          # should include <linux/mod_device_id/mhi.h>
            ),
        'mips_cdmm_device_id': (
            'linux/mod_device_id/mips_cdmm.h',
            'asm/cdmm.h',                           # arch/mips/include/asm/cdmm.h includes mod_devicetable.h
            ),
        'of_device_id': (
            'linux/mod_device_id/of.h',
            'linux/of.h',                           # includes <linux/mod_devicetable.h>
            'linux/of_address.h',                   # includes <linux/of.h>
            'linux/of_platform.h',                  # includes <linux/mod_devicetable.h>
            'linux/device/driver.h',                # includes <linux/mod_device_id/of.h>
            'linux/device.h',                       # includes <linux/device/driver.h>
            'linux/acpi.h',                         # includes <linux/device.h>
            'linux/backlight.h',                    # includes <linux/device.h>
            'linux/moxtet.h',                       # includes <linux/device.h>
            'linux/greybus.h',                      # includes <linux/device.h>
            'linux/platform_device.h',              # includes <linux/device.h>
            'linux/powercap.h',                     # includes <linux/device.h>
            'linux/auxiliary_bus.h',                # includes <linux/device.h>
            'linux/i2c.h',                          # includes <linux/of.h>
            'linux/reset.h',                        # includes <linux/of.h>
            'linux/spi/spi.h',                      # includes <linux/device.h>
            'asm/machine.h',                        # arch/mips/include/asm/machine.h includes <linux/of.h>
            'asm/macio.h',                          # arch/powerpc/include/asm/macio.h includes <linux/of.h>
            'sound/soc.h',                          # includes <linux/platform_device.h>
            'sound/dmaengine_pcm.h',                # includes <sound/soc.h>
            'linux/pm_qos.h',                       # includes <linux/device.h>
            'linux/clk-provider.h',                 # includes <linux/of.h>
            ),
        'parisc_device_id': (
            'linux/mod_device_id/parisc.h',
            'asm/parisc-device.h',                  # should include <linux/mod_device_id/parisc.h>
            'asm/hardware.h',                       # includes <linux/mod_devicetable.h>
            ),
        'pci_device_id': (
            'linux/mod_device_id/pci.h',
            'linux/pci.h',                          # includes <linux/mod_devicetable.h>
            'linux/comedi/comedi_pci.h',            # includes <linux/pci.h>
            'sound/hdaudio.h',                      # includes <linux/pci.h>
            'sound/hdaudio_ext.h',                  # includes <sound/hdaudio.h>
            ),
        'pci_epf_device_id': (
            'linux/mod_device_id/pci.h',
            'linux/pci-epf.h',                      # includes <linux/mod_devicetable.h>
            ),
        'pcmcia_device_id': (
            'linux/mod_device_id/pcmcia.h',
            'pcmcia/ds.h',                          # includes <linux/mod_devicetable.h>
            'linux/comedi/comedi_pcmcia.h',         # includes <pcmcia/ds.h>
            ),
        'platform_device_id': (
            'linux/mod_device_id/platform.h',
            'linux/platform_device.h',              # includes <linux/mod_device_id/platform.h>
            'linux/mfd/core.h',                     # includes <linux/platform_device.h>
            'linux/ipmi_smi.h',                     # includes <linux/platform_device.h>
            'sound/soc.h',                          # includes <linux/platform_device.h>
            'sound/dmaengine_pcm.h',                # includes <sound/soc.h>
            ),
        'pnp_(card_)?device_id': (
            'linux/mod_device_id/pnp.h',
            'linux/pnp.h',                          # includes <linux/mod_devicetable.h>
            'linux/isapnp.h',                       # includes <linux/pnp.h>
            ),
        'rio_device_id': (
            'linux/mod_device_id/rio.h',
            'linux/rio.h',                          # includes <linux/mod_devicetable.h>
            ),
        'rpmsg_device_id': (
            'linux/mod_device_id/rpmsg.h',
            'linux/rpmsg.h',                        # includes <linux/mod_devicetable.h>
            ),
        'sdio_device_id': (
            'linux/mod_device_id/sdio.h',
            'linux/mmc/sdio_func.h',                # includes <linux/mod_devicetable.h>
            ),
        'sdw_device_id': (
            'linux/mod_device_id/sdw.h',
            'linux/soundwire/sdw.h',                # includes <linux/mod_devicetable.h>
            ),
        'serio_device_id': (
            'linux/mod_device_id/serio.h',
            'linux/serio.h',                        # includes <linux/mod_devicetable.h>
            'linux/hil_mlc.h',                      # includes <linux/serio.h>
            ),
        'slim_device_id': (
            'linux/mod_device_id/slim.h',
            'linux/slimbus.h',                      # includes <linux/mod_devicetable.h>
            ),
        'spi_device_id': (
            'linux/mod_device_id/spi.h',
            'linux/spi/spi.h',                      # includes <linux/mod_devicetable.h>
            ),
        'spmi_device_id': (
            'linux/mod_device_id/spmi.h',
            ),
        'ssam_device_id': (
            'linux/mod_device_id/ssam.h',
            'linux/surface_aggregator/device.h',    # includes <linux/mod_devicetable.h>
            ),
        'ssb_device_id': (
            'linux/mod_device_id/ssb.h',
            'linux/ssb/ssb.h',                      # includes <linux/mod_devicetable.h>
            ),
        'tb_service_id': (
            'linux/mod_device_id/tb.h',
            'linux/thunderbolt.h',                  # includes <linux/mod_devicetable.h>
            'tb.h',                                 # drivers/thunderbolt/tb.h includes <linux/thunderbolt.h>
            ),
        'tee_client_device_id': (
            'linux/mod_device_id/tee_client.h',
            'linux/tee_drv.h',                      # includes <linux/mod_devicetable.h>
            'linux/tee_core.h',                     # includes <linux/tee_drv.h>
            ),
        'typec_device_id': (
            'linux/mod_device_id/typec.h',
            'linux/usb/typec_altmode.h',            # includes <linux/mod_devicetable.h>
            'linux/usb/typec_dp.h',                 # includes <linux/usb/typec_altmode.h>
            ),
        'ulpi_device_id': (
            'linux/mod_device_id/ulpi.h',
            'linux/ulpi/driver.h',                  # includes <linux/mod_devicetable.h>
            ),
        'usb_device_id': (
            'linux/mod_device_id/usb.h',
            'linux/usb.h',                          # includes <linux/mod_devicetable.h>
            'linux/comedi/comedi_usb.h',            # includes <linux/usb.h>
            'linux/usb/input.h',                    # includes <linux/usb.h>
            ),
        'vchiq_device_id': (
            'linux/mod_device_id/vchiq.h',
            'linux/raspberrypi/vchiq_bus.h',        # includes <linux/mod_devicetable.h>
            ),
        'virtio_device_id': (
            'linux/mod_device_id/virtio.h',
            'linux/virtio.h',                       # includes <linux/mod_devicetable.h>
            'linux/virtio_config.h',                # includes <linux/virtio.h>
            'uapi/linux/virtio_pmem.h',             # includes <linux/virtio_config.h>
            ),
        'wmi_device_id': (
            'linux/mod_device_id/wmi.h',
            'linux/wmi.h',                          # includes <linux/mod_devicetable.h>
            ),
        'x86_(cpu|device)_id': (
            'linux/mod_device_id/x86_cpu.h',
            'linux/platform_data/x86/soc.h',        # includes <linux/mod_devicetable.h>
            'asm/cpu_device_id.h',                  # includes <linux/mod_devicetable.h>
            ),
        'zorro_device_id': (
            'linux/mod_device_id/zorro.h',
            'linux/zorro.h',                        # includes <linux/mod_devicetable.h>
            ),

        'cpu_feature': (
            'linux/mod_devicetable.h',
            'linux/cpufeature.h',                   # includes <linux/mod_devicetable.h>
            ),
    }

for dirpath, dirnames, filenames in os.walk('.'):
    for fn in (os.path.join(dirpath, f) for f in filenames if re.match(r'.*\.[ch]$', f)):
        if fn in ('./scripts/mod/devicetable-offsets.c', './scripts/mod/file2alias.c'):
            continue
        with open(fn) as f:
            try:
                filecontent = f.read()
            except Exception as e:
                print(f"Error { e } while reading { fn }")
                continue

        # If the file has an include of the legacy header, drop it
        if momdt := re.search(r'#[ \t]*include\s*[<"]linux/mod_devicetable.h[>"]([ \t]*/\*[^*]*\*/)?[ \t]*\n', filecontent):
            filecontent = filecontent[:momdt.start()] + filecontent[momdt.end():]

        for s, hs in symbol_header_map.items():
            if re.search(fr'\bstruct\s*{ s }\b\s*;', filecontent):
                # with a forward declaration assume we're fine (unsafe!)
                continue

            if re.search(fr'\bstruct\s*{ s }\b', filecontent):
                if fn.endswith(tuple('/' + h for h in hs)):
                    break

                # include local headers
                seenheaders = set()
                expanded_filecontent = filecontent
                while mo := re.search(r'#\s*include\s*"([^"]*)"', expanded_filecontent):
                    start, end = mo.span(0)
                    lhn = mo.group(1)
                    
                    if lhn in seenheaders:
                        expanded_filecontent = expanded_filecontent[:start] + expanded_filecontent[end:]
                    else:
                        seenheaders.add(lhn)
                        try:
                            with open(os.path.join(dirpath, lhn)) as lh:
                                lhcontent = lh.read()
                            expanded_filecontent = expanded_filecontent[:start] + lhcontent + expanded_filecontent[end:]
                        except Exception:
                            expanded_filecontent = expanded_filecontent[:start] + expanded_filecontent[end:]

                for h in hs:
                    if re.search(fr'#\s*include\s*[<"]{ h }[>"]', expanded_filecontent):
                        break
                else:
                    # only rewrite .c files, headers need more care
                    if momdt:
                        if fn.endswith('.c'):
                            filecontent = filecontent[:momdt.start()] + f'#include <{ hs[0] }>\n' + filecontent[momdt.start():]

                    else:
                        print(f"Header for { s } missing in { fn }")

        if momdt and fn.endswith('.c'):
            with open(fn, "w") as f:
                f.write(filecontent)
------->8--------


Uwe Kleine-König (The Capable Hub) (17):
  mod_devicetable.h: Split into per subsystem headers
  media: ti: vpe: #include <linux/platform_device.h> explicitly
  ASoC: rockchip: rockchip_sai: #include <linux/platform_device.h>
    explicitly
  driver: core: Include headers for acpi_device_id and of_device_id for
    struct device_driver
  driver core: platform: Include header for struct platform_device_id
  usb: serial: Include <linux/usb.h> in <linux/usb/serial.h>
  platform/x86: msi-ec: Ensure dmi_system_id is defined
  of: Explicitly include <linux/types.h> and <linux/err.h>
  i2c: Let i2c-core.h include <linux/i2c.h>
  platform/x86: x86-android-tablets: Add include defining struct
    dmi_system_id
  platform/x86: int3472: Add include defining struct dmi_system_id
  usb: dwc2: Add include defining struct pci_device_id
  ALSA: hda/core: Add include defining struct hda_device_id
  LoongArch: KVM: Add include defining struct cpu_feature
  media: em28xx: Add include for struct usb_device_id
  Replace <linux/mod_devicetable.h> by more specific
    <linux/mod_device_id/*.h> (headers)
  Replace <linux/mod_devicetable.h> by more specific
    <linux/mod_device_id/*.h> (c files)

 arch/arm/mach-omap2/board-generic.c           |    1 -
 arch/loongarch/kvm/main.c                     |    1 +
 arch/mips/include/asm/cdmm.h                  |    2 +-
 arch/mips/lantiq/xway/dcdc.c                  |    1 -
 arch/mips/lantiq/xway/gptu.c                  |    1 -
 arch/mips/lantiq/xway/vmmc.c                  |    1 -
 arch/mips/pci/pci-rt2880.c                    |    1 -
 arch/mips/ralink/timer.c                      |    1 -
 arch/parisc/include/asm/hardware.h            |    4 +-
 arch/parisc/include/asm/parisc-device.h       |    1 +
 .../powerpc/platforms/83xx/mcu_mpc8349emitx.c |    1 -
 arch/powerpc/platforms/86xx/common.c          |    1 -
 arch/powerpc/sysdev/fsl_lbc.c                 |    1 -
 arch/powerpc/sysdev/fsl_pmc.c                 |    1 -
 arch/s390/include/asm/ccwdev.h                |    2 +-
 arch/sh/drivers/platform_early.c              |    2 +-
 arch/sparc/crypto/crop_devid.c                |    2 +-
 arch/sparc/kernel/of_device_32.c              |    1 -
 arch/sparc/kernel/of_device_64.c              |    1 -
 arch/sparc/kernel/of_device_common.c          |    1 -
 arch/x86/include/asm/cpu_device_id.h          |    5 +-
 arch/x86/kvm/svm/svm.c                        |    1 -
 arch/x86/kvm/vmx/vmx.c                        |    1 -
 drivers/accel/ethosu/ethosu_drv.c             |    1 -
 drivers/accel/qaic/qaic_timesync.c            |    1 -
 drivers/accel/qaic/sahara.c                   |    1 -
 drivers/ata/ahci_platform.c                   |    1 -
 drivers/ata/ahci_sunxi.c                      |    1 -
 drivers/ata/pata_buddha.c                     |    1 -
 drivers/ata/pata_ep93xx.c                     |    1 -
 drivers/ata/pata_imx.c                        |    1 -
 drivers/auxdisplay/arm-charlcd.c              |    1 -
 drivers/auxdisplay/hd44780.c                  |    1 -
 drivers/auxdisplay/lcd2s.c                    |    1 -
 drivers/auxdisplay/max6959.c                  |    1 -
 drivers/auxdisplay/seg-led-gpio.c             |    1 -
 drivers/block/floppy.c                        |    2 +-
 drivers/bluetooth/hci_h5.c                    |    1 -
 drivers/bluetooth/hci_qca.c                   |    1 -
 drivers/bus/mhi/ep/main.c                     |    1 -
 drivers/bus/mhi/host/init.c                   |    1 -
 drivers/cache/hisi_soc_hha.c                  |    1 -
 drivers/cdx/controller/cdx_controller.c       |    1 -
 drivers/char/hw_random/airoha-trng.c          |    1 -
 drivers/char/hw_random/atmel-rng.c            |    1 -
 drivers/char/hw_random/ba431-rng.c            |    1 -
 drivers/char/hw_random/bcm74110-rng.c         |    1 -
 drivers/char/hw_random/exynos-trng.c          |    1 -
 drivers/char/hw_random/histb-rng.c            |    1 -
 drivers/char/hw_random/imx-rngc.c             |    1 -
 drivers/char/hw_random/ingenic-trng.c         |    1 -
 drivers/char/hw_random/iproc-rng200.c         |    1 -
 drivers/char/hw_random/pasemi-rng.c           |    1 -
 drivers/char/hw_random/pic32-rng.c            |    1 -
 drivers/char/hw_random/powernv-rng.c          |    1 -
 drivers/char/hw_random/xgene-rng.c            |    1 -
 drivers/char/hw_random/xilinx-trng.c          |    1 -
 drivers/char/hw_random/xiphera-trng.c         |    1 -
 drivers/clk/aspeed/clk-ast2600.c              |    1 -
 drivers/clk/aspeed/clk-ast2700.c              |    1 -
 drivers/clk/clk-axi-clkgen.c                  |    1 -
 drivers/clk/clk-bm1880.c                      |    1 -
 drivers/clk/clk-cdce706.c                     |    1 -
 drivers/clk/clk-eyeq.c                        |    1 -
 drivers/clk/clk-renesas-pcie.c                |    1 -
 drivers/clk/clk-si521xx.c                     |    1 -
 drivers/clk/clk-versaclock5.c                 |    1 -
 drivers/clk/imx/clk-imx8mp-audiomix.c         |    1 -
 drivers/clk/mediatek/clk-mt2701-g3d.c         |    1 -
 drivers/clk/mediatek/clk-mt2701.c             |    1 -
 drivers/clk/mediatek/clk-mt2712.c             |    1 -
 drivers/clk/mediatek/clk-mt6765.c             |    1 -
 drivers/clk/mediatek/clk-mt6779-aud.c         |    1 -
 drivers/clk/mediatek/clk-mt7622-eth.c         |    1 -
 drivers/clk/mediatek/clk-mt7622-hif.c         |    1 -
 drivers/clk/mediatek/clk-mt7622.c             |    1 -
 drivers/clk/mediatek/clk-mt7629-hif.c         |    1 -
 drivers/clk/mediatek/clk-mt7981-apmixed.c     |    1 -
 drivers/clk/mediatek/clk-mt7981-eth.c         |    1 -
 drivers/clk/mediatek/clk-mt7981-infracfg.c    |    1 -
 drivers/clk/mediatek/clk-mt7981-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt7986-apmixed.c     |    1 -
 drivers/clk/mediatek/clk-mt7986-eth.c         |    1 -
 drivers/clk/mediatek/clk-mt7986-infracfg.c    |    1 -
 drivers/clk/mediatek/clk-mt7986-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt8167-aud.c         |    1 -
 drivers/clk/mediatek/clk-mt8167-img.c         |    1 -
 drivers/clk/mediatek/clk-mt8167-mfgcfg.c      |    1 -
 drivers/clk/mediatek/clk-mt8167-mm.c          |    1 -
 drivers/clk/mediatek/clk-mt8167-vdec.c        |    1 -
 drivers/clk/mediatek/clk-mt8173-mm.c          |    1 -
 drivers/clk/mediatek/clk-mt8183.c             |    1 -
 .../clk/mediatek/clk-mt8188-adsp_audio26m.c   |    1 -
 drivers/clk/mediatek/clk-mt8188-apmixedsys.c  |    1 -
 .../clk/mediatek/clk-mt8188-imp_iic_wrap.c    |    1 -
 drivers/clk/mediatek/clk-mt8188-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt8188-vdo0.c        |    1 -
 drivers/clk/mediatek/clk-mt8188-vdo1.c        |    1 -
 drivers/clk/mediatek/clk-mt8188-venc.c        |    1 -
 drivers/clk/mediatek/clk-mt8188-wpe.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-cam.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-img.c         |    1 -
 .../clk/mediatek/clk-mt8192-imp_iic_wrap.c    |    1 -
 drivers/clk/mediatek/clk-mt8192-ipe.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-mdp.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-mfg.c         |    1 -
 drivers/clk/mediatek/clk-mt8192-msdc.c        |    1 -
 drivers/clk/mediatek/clk-mt8192-scp_adsp.c    |    1 -
 drivers/clk/mediatek/clk-mt8192-vdec.c        |    1 -
 drivers/clk/mediatek/clk-mt8192-venc.c        |    1 -
 drivers/clk/mediatek/clk-mt8192.c             |    1 -
 drivers/clk/mediatek/clk-mt8195-apmixedsys.c  |    1 -
 drivers/clk/mediatek/clk-mt8195-topckgen.c    |    1 -
 drivers/clk/mediatek/clk-mt8365.c             |    1 -
 drivers/clk/mediatek/clk-mt8516-aud.c         |    1 -
 drivers/clk/meson/a1-peripherals.c            |    1 -
 drivers/clk/meson/a1-pll.c                    |    1 -
 drivers/clk/meson/axg.c                       |    1 -
 drivers/clk/meson/gxbb.c                      |    1 -
 drivers/clk/qcom/cambistmclkcc-kaanapali.c    |    1 -
 drivers/clk/qcom/cambistmclkcc-sm8750.c       |    1 -
 drivers/clk/qcom/camcc-kaanapali.c            |    1 -
 drivers/clk/qcom/camcc-milos.c                |    1 -
 drivers/clk/qcom/camcc-qcs615.c               |    1 -
 drivers/clk/qcom/camcc-sa8775p.c              |    1 -
 drivers/clk/qcom/camcc-sc7180.c               |    1 -
 drivers/clk/qcom/camcc-sc7280.c               |    1 -
 drivers/clk/qcom/camcc-sc8180x.c              |    1 -
 drivers/clk/qcom/camcc-sc8280xp.c             |    1 -
 drivers/clk/qcom/camcc-sdm845.c               |    1 -
 drivers/clk/qcom/camcc-sm4450.c               |    1 -
 drivers/clk/qcom/camcc-sm6350.c               |    1 -
 drivers/clk/qcom/camcc-sm7150.c               |    1 -
 drivers/clk/qcom/camcc-sm8150.c               |    1 -
 drivers/clk/qcom/camcc-sm8250.c               |    1 -
 drivers/clk/qcom/camcc-sm8450.c               |    1 -
 drivers/clk/qcom/camcc-sm8550.c               |    1 -
 drivers/clk/qcom/camcc-sm8650.c               |    1 -
 drivers/clk/qcom/camcc-sm8750.c               |    1 -
 drivers/clk/qcom/camcc-x1e80100.c             |    1 -
 drivers/clk/qcom/dispcc-eliza.c               |    1 -
 drivers/clk/qcom/dispcc-glymur.c              |    1 -
 drivers/clk/qcom/dispcc-kaanapali.c           |    1 -
 drivers/clk/qcom/dispcc-milos.c               |    1 -
 drivers/clk/qcom/dispcc-qcm2290.c             |    1 -
 drivers/clk/qcom/dispcc-qcs615.c              |    1 -
 drivers/clk/qcom/dispcc-sc7180.c              |    1 -
 drivers/clk/qcom/dispcc-sc7280.c              |    1 -
 drivers/clk/qcom/dispcc-sc8280xp.c            |    1 -
 drivers/clk/qcom/dispcc-sdm845.c              |    1 -
 drivers/clk/qcom/dispcc-sm4450.c              |    1 -
 drivers/clk/qcom/dispcc-sm6115.c              |    1 -
 drivers/clk/qcom/dispcc-sm6125.c              |    1 -
 drivers/clk/qcom/dispcc-sm6350.c              |    1 -
 drivers/clk/qcom/dispcc-sm6375.c              |    1 -
 drivers/clk/qcom/dispcc-sm7150.c              |    1 -
 drivers/clk/qcom/dispcc-sm8250.c              |    1 -
 drivers/clk/qcom/dispcc-sm8450.c              |    1 -
 drivers/clk/qcom/dispcc-sm8550.c              |    1 -
 drivers/clk/qcom/dispcc-sm8750.c              |    1 -
 drivers/clk/qcom/dispcc-x1e80100.c            |    1 -
 drivers/clk/qcom/dispcc0-sa8775p.c            |    1 -
 drivers/clk/qcom/dispcc1-sa8775p.c            |    1 -
 drivers/clk/qcom/ecpricc-qdu1000.c            |    1 -
 drivers/clk/qcom/gcc-eliza.c                  |    1 -
 drivers/clk/qcom/gcc-glymur.c                 |    1 -
 drivers/clk/qcom/gcc-ipq5018.c                |    1 -
 drivers/clk/qcom/gcc-ipq5332.c                |    1 -
 drivers/clk/qcom/gcc-kaanapali.c              |    1 -
 drivers/clk/qcom/gcc-milos.c                  |    1 -
 drivers/clk/qcom/gcc-nord.c                   |    1 -
 drivers/clk/qcom/gcc-qcs615.c                 |    1 -
 drivers/clk/qcom/gcc-qcs8300.c                |    1 -
 drivers/clk/qcom/gcc-sa8775p.c                |    1 -
 drivers/clk/qcom/gcc-sdx75.c                  |    1 -
 drivers/clk/qcom/gcc-sm4450.c                 |    1 -
 drivers/clk/qcom/gcc-sm7150.c                 |    1 -
 drivers/clk/qcom/gcc-sm8650.c                 |    1 -
 drivers/clk/qcom/gcc-sm8750.c                 |    1 -
 drivers/clk/qcom/gcc-x1e80100.c               |    1 -
 drivers/clk/qcom/gpucc-glymur.c               |    1 -
 drivers/clk/qcom/gpucc-kaanapali.c            |    1 -
 drivers/clk/qcom/gpucc-milos.c                |    1 -
 drivers/clk/qcom/gpucc-msm8998.c              |    1 -
 drivers/clk/qcom/gpucc-qcm2290.c              |    1 -
 drivers/clk/qcom/gpucc-qcs615.c               |    1 -
 drivers/clk/qcom/gpucc-sa8775p.c              |    1 -
 drivers/clk/qcom/gpucc-sar2130p.c             |    1 -
 drivers/clk/qcom/gpucc-sc7180.c               |    1 -
 drivers/clk/qcom/gpucc-sc7280.c               |    1 -
 drivers/clk/qcom/gpucc-sc8280xp.c             |    1 -
 drivers/clk/qcom/gpucc-sdm660.c               |    1 -
 drivers/clk/qcom/gpucc-sdm845.c               |    1 -
 drivers/clk/qcom/gpucc-sm4450.c               |    1 -
 drivers/clk/qcom/gpucc-sm6115.c               |    1 -
 drivers/clk/qcom/gpucc-sm6125.c               |    1 -
 drivers/clk/qcom/gpucc-sm6350.c               |    1 -
 drivers/clk/qcom/gpucc-sm6375.c               |    1 -
 drivers/clk/qcom/gpucc-sm8150.c               |    1 -
 drivers/clk/qcom/gpucc-sm8250.c               |    1 -
 drivers/clk/qcom/gpucc-sm8350.c               |    1 -
 drivers/clk/qcom/gpucc-sm8450.c               |    1 -
 drivers/clk/qcom/gpucc-sm8550.c               |    1 -
 drivers/clk/qcom/gpucc-sm8650.c               |    1 -
 drivers/clk/qcom/gpucc-sm8750.c               |    1 -
 drivers/clk/qcom/gpucc-x1e80100.c             |    1 -
 drivers/clk/qcom/gpucc-x1p42100.c             |    1 -
 drivers/clk/qcom/gxclkctl-kaanapali.c         |    1 -
 drivers/clk/qcom/ipq-cmn-pll.c                |    1 -
 drivers/clk/qcom/lpasscc-sc8280xp.c           |    1 -
 drivers/clk/qcom/lpasscc-sm6115.c             |    1 -
 drivers/clk/qcom/mmcc-apq8084.c               |    1 -
 drivers/clk/qcom/mmcc-msm8960.c               |    1 -
 drivers/clk/qcom/mmcc-msm8974.c               |    1 -
 drivers/clk/qcom/mmcc-msm8994.c               |    1 -
 drivers/clk/qcom/mmcc-msm8996.c               |    1 -
 drivers/clk/qcom/mmcc-msm8998.c               |    1 -
 drivers/clk/qcom/mmcc-sdm660.c                |    1 -
 drivers/clk/qcom/negcc-nord.c                 |    1 -
 drivers/clk/qcom/nwgcc-nord.c                 |    1 -
 drivers/clk/qcom/segcc-nord.c                 |    1 -
 drivers/clk/qcom/tcsrcc-eliza.c               |    1 -
 drivers/clk/qcom/tcsrcc-glymur.c              |    1 -
 drivers/clk/qcom/tcsrcc-nord.c                |    1 -
 drivers/clk/qcom/tcsrcc-sm8650.c              |    1 -
 drivers/clk/qcom/tcsrcc-sm8750.c              |    1 -
 drivers/clk/qcom/tcsrcc-x1e80100.c            |    1 -
 drivers/clk/qcom/videocc-glymur.c             |    1 -
 drivers/clk/qcom/videocc-kaanapali.c          |    1 -
 drivers/clk/qcom/videocc-milos.c              |    1 -
 drivers/clk/qcom/videocc-qcs615.c             |    1 -
 drivers/clk/qcom/videocc-sa8775p.c            |    1 -
 drivers/clk/qcom/videocc-sm7150.c             |    1 -
 drivers/clk/qcom/videocc-sm8450.c             |    1 -
 drivers/clk/qcom/videocc-sm8550.c             |    1 -
 drivers/clk/qcom/videocc-sm8750.c             |    1 -
 drivers/clk/renesas/clk-vbattb.c              |    1 -
 drivers/clk/renesas/renesas-cpg-mssr.c        |    1 -
 drivers/clk/renesas/rzg2l-cpg.c               |    1 -
 drivers/clk/renesas/rzv2h-cpg.c               |    1 -
 drivers/clk/samsung/clk-exynos-audss.c        |    1 -
 drivers/clk/samsung/clk-exynos-clkout.c       |    1 -
 drivers/clk/samsung/clk-exynos2200.c          |    1 -
 drivers/clk/samsung/clk-exynos3250.c          |    1 -
 drivers/clk/samsung/clk-exynos4.c             |    1 -
 drivers/clk/samsung/clk-exynos4412-isp.c      |    1 -
 drivers/clk/samsung/clk-exynos5-subcmu.c      |    1 -
 drivers/clk/samsung/clk-exynos5250.c          |    1 -
 drivers/clk/samsung/clk-exynos5420.c          |    1 -
 drivers/clk/samsung/clk-exynos5433.c          |    1 -
 drivers/clk/samsung/clk-exynos7870.c          |    1 -
 drivers/clk/samsung/clk-exynos7885.c          |    1 -
 drivers/clk/samsung/clk-exynos850.c           |    1 -
 drivers/clk/samsung/clk-exynos8895.c          |    1 -
 drivers/clk/samsung/clk-exynos990.c           |    1 -
 drivers/clk/samsung/clk-exynosautov9.c        |    1 -
 drivers/clk/samsung/clk-exynosautov920.c      |    1 -
 drivers/clk/samsung/clk-fsd.c                 |    1 -
 drivers/clk/samsung/clk-gs101.c               |    1 -
 drivers/clk/samsung/clk-s5pv210-audss.c       |    1 -
 drivers/clk/samsung/clk.c                     |    1 -
 drivers/clk/sprd/ums512-clk.c                 |    1 -
 .../clk/starfive/clk-starfive-jh7100-audio.c  |    1 -
 drivers/clk/starfive/clk-starfive-jh7100.c    |    1 -
 drivers/clk/tegra/clk-device.c                |    1 -
 drivers/clk/xilinx/xlnx_vcu.c                 |    1 -
 drivers/counter/interrupt-cnt.c               |    1 -
 drivers/counter/stm32-lptimer-cnt.c           |    1 -
 drivers/counter/stm32-timer-cnt.c             |    1 -
 drivers/counter/ti-ecap-capture.c             |    1 -
 drivers/counter/ti-eqep.c                     |    1 -
 drivers/cpufreq/amd_freq_sensitivity.c        |    1 -
 drivers/cpufreq/armada-37xx-cpufreq.c         |    1 -
 drivers/crypto/atmel-aes.c                    |    1 -
 drivers/crypto/atmel-sha.c                    |    1 -
 drivers/crypto/atmel-tdes.c                   |    1 -
 drivers/crypto/hifn_795x.c                    |    1 -
 drivers/crypto/img-hash.c                     |    1 -
 .../intel/keembay/keembay-ocs-hcu-core.c      |    1 -
 drivers/crypto/qce/core.c                     |    1 -
 drivers/crypto/starfive/jh7110-cryp.c         |    1 -
 drivers/crypto/talitos.c                      |    1 -
 drivers/crypto/tegra/tegra-se-main.c          |    1 -
 drivers/crypto/ti/dthev2-common.c             |    1 -
 drivers/crypto/xilinx/zynqmp-aes-gcm.c        |    1 -
 drivers/devfreq/hisi_uncore_freq.c            |    1 -
 drivers/devfreq/imx8m-ddrc.c                  |    1 -
 drivers/dma/amd/qdma/qdma.c                   |    1 -
 drivers/dma/ep93xx_dma.c                      |    1 -
 drivers/dma/qcom/hidma.c                      |    1 -
 drivers/dma/sf-pdma/sf-pdma.c                 |    1 -
 drivers/dma/xgene-dma.c                       |    1 -
 drivers/dma/xilinx/xdma.c                     |    1 -
 drivers/dpll/zl3073x/dpll.c                   |    1 -
 drivers/edac/fsl_ddr_edac.c                   |    1 -
 drivers/edac/mpc85xx_edac.c                   |    1 -
 drivers/edac/pnd2_edac.c                      |    1 -
 drivers/edac/sb_edac.c                        |    1 -
 drivers/extcon/extcon-intel-cht-wc.c          |    1 -
 drivers/extcon/extcon-intel-mrfld.c           |    1 -
 drivers/extcon/extcon-max14526.c              |    1 -
 drivers/extcon/extcon-max3355.c               |    1 -
 drivers/extcon/extcon-qcom-spmi-misc.c        |    1 -
 drivers/extcon/extcon-usb-gpio.c              |    1 -
 drivers/firewire/core-device.c                |    1 -
 drivers/firewire/net.c                        |    1 -
 drivers/firewire/sbp2.c                       |    1 -
 drivers/firmware/google/cbmem.c               |    2 +-
 drivers/firmware/google/coreboot_table.c      |    2 +-
 .../firmware/google/framebuffer-coreboot.c    |    2 +-
 drivers/firmware/google/memconsole-coreboot.c |    2 +-
 drivers/firmware/google/vpd.c                 |    2 +-
 drivers/firmware/qemu_fw_cfg.c                |    1 -
 drivers/fpga/altera-freeze-bridge.c           |    1 -
 drivers/fpga/altera-pr-ip-core-plat.c         |    1 -
 drivers/fpga/ice40-spi.c                      |    1 -
 drivers/fpga/intel-m10-bmc-sec-update.c       |    1 -
 drivers/fpga/xilinx-selectmap.c               |    1 -
 drivers/fpga/xilinx-spi.c                     |    1 -
 drivers/fsi/fsi-master-i2cr.c                 |    1 -
 drivers/fsi/fsi-scom.c                        |    2 +-
 drivers/fsi/i2cr-scom.c                       |    1 -
 drivers/gpib/eastwood/fluke_gpib.c            |    1 -
 drivers/gpio/gpio-74xx-mmio.c                 |    1 -
 drivers/gpio/gpio-adnp.c                      |    1 -
 drivers/gpio/gpio-aggregator.c                |    1 -
 drivers/gpio/gpio-altera-a10sr.c              |    2 +-
 drivers/gpio/gpio-altera.c                    |    1 -
 drivers/gpio/gpio-ath79.c                     |    1 -
 drivers/gpio/gpio-bcm-kona.c                  |    1 -
 drivers/gpio/gpio-by-pinctrl.c                |    1 -
 drivers/gpio/gpio-cros-ec.c                   |    1 -
 drivers/gpio/gpio-dwapb.c                     |    1 -
 drivers/gpio/gpio-en7523.c                    |    1 -
 drivers/gpio/gpio-ge.c                        |    1 -
 drivers/gpio/gpio-graniterapids.c             |    1 -
 drivers/gpio/gpio-hisi.c                      |    1 -
 drivers/gpio/gpio-idt3243x.c                  |    1 -
 drivers/gpio/gpio-latch.c                     |    1 -
 drivers/gpio/gpio-line-mux.c                  |    1 -
 drivers/gpio/gpio-ltc4283.c                   |    1 -
 drivers/gpio/gpio-max7360.c                   |    1 -
 drivers/gpio/gpio-max77759.c                  |    1 -
 drivers/gpio/gpio-mb86s7x.c                   |    1 -
 drivers/gpio/gpio-mlxbf2.c                    |    1 -
 drivers/gpio/gpio-mmio.c                      |    1 -
 drivers/gpio/gpio-mockup.c                    |    1 -
 drivers/gpio/gpio-mpc8xxx.c                   |    1 -
 drivers/gpio/gpio-mpfs.c                      |    1 -
 drivers/gpio/gpio-nomadik.c                   |    1 -
 drivers/gpio/gpio-pca953x.c                   |    1 -
 drivers/gpio/gpio-pcf857x.c                   |    1 -
 drivers/gpio/gpio-qixis-fpga.c                |    1 -
 drivers/gpio/gpio-realtek-otto.c              |    1 -
 drivers/gpio/gpio-shared-proxy.c              |    1 -
 drivers/gpio/gpio-sim.c                       |    1 -
 drivers/gpio/gpio-sl28cpld.c                  |    1 -
 drivers/gpio/gpio-sloppy-logic-analyzer.c     |    1 -
 drivers/gpio/gpio-sprd.c                      |    1 -
 drivers/gpio/gpio-tn48m.c                     |    1 -
 drivers/gpio/gpio-virtuser.c                  |    1 -
 drivers/gpio/gpio-wcd934x.c                   |    1 -
 drivers/gpio/gpio-xgene-sb.c                  |    1 -
 drivers/gpio/gpio-xra1403.c                   |    1 -
 drivers/gpio/gpio-zevio.c                     |    1 -
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c       |    1 -
 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c   |    1 -
 drivers/gpu/drm/bridge/inno-hdmi.c            |    1 -
 drivers/gpu/drm/bridge/ssd2825.c              |    1 -
 drivers/gpu/drm/bridge/tc358762.c             |    2 +-
 drivers/gpu/drm/bridge/tc358764.c             |    2 +-
 drivers/gpu/drm/bridge/th1520-dw-hdmi.c       |    1 -
 drivers/gpu/drm/drm_panel_backlight_quirks.c  |    1 -
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c         |    1 -
 drivers/gpu/drm/exynos/exynos_drm_gsc.c       |    1 -
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c  |    1 -
 drivers/gpu/drm/imagination/pvr_drv.c         |    1 -
 drivers/gpu/drm/imx/dc/dc-cf.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-de.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-drv.c               |    1 -
 drivers/gpu/drm/imx/dc/dc-ed.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-fg.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-fl.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-fw.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-lb.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-pe.c                |    1 -
 drivers/gpu/drm/imx/dc/dc-tc.c                |    1 -
 drivers/gpu/drm/imx/lcdc/imx-lcdc.c           |    1 -
 drivers/gpu/drm/mediatek/mtk_cec.c            |    1 -
 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c       |    1 -
 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c     |    1 -
 drivers/gpu/drm/mxsfb/mxsfb_drv.c             |    1 -
 drivers/gpu/drm/panel/panel-arm-versatile.c   |    1 -
 drivers/gpu/drm/panel/panel-auo-a030jtn01.c   |    1 -
 drivers/gpu/drm/panel/panel-boe-td4320.c      |    2 +-
 .../gpu/drm/panel/panel-feixin-k101-im2ba02.c |    2 +-
 .../drm/panel/panel-feiyang-fy07024di26a30d.c |    2 +-
 drivers/gpu/drm/panel/panel-himax-hx83112b.c  |    1 -
 drivers/gpu/drm/panel/panel-himax-hx83121a.c  |    1 -
 drivers/gpu/drm/panel/panel-himax-hx8394.c    |    1 -
 drivers/gpu/drm/panel/panel-hydis-hv101hd1.c  |    2 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9341.c  |    1 -
 .../gpu/drm/panel/panel-ilitek-ili9806e-dsi.c |    1 -
 drivers/gpu/drm/panel/panel-lg-ld070wx3.c     |    2 +-
 drivers/gpu/drm/panel/panel-motorola-mot.c    |    2 +-
 drivers/gpu/drm/panel/panel-novatek-nt35532.c |    2 +-
 drivers/gpu/drm/panel/panel-novatek-nt37801.c |    1 -
 .../gpu/drm/panel/panel-orisetech-otm8009a.c  |    1 -
 drivers/gpu/drm/panel/panel-raydium-rm67200.c |    2 +-
 drivers/gpu/drm/panel/panel-raydium-rm68200.c |    2 +-
 drivers/gpu/drm/panel/panel-renesas-r61307.c  |    2 +-
 drivers/gpu/drm/panel/panel-renesas-r69328.c  |    2 +-
 .../gpu/drm/panel/panel-samsung-ltl106hl02.c  |    2 +-
 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c |    2 +-
 .../gpu/drm/panel/panel-samsung-s6e63j0x03.c  |    1 -
 .../gpu/drm/panel/panel-samsung-s6e63m0-dsi.c |    2 +-
 .../panel/panel-samsung-s6e88a0-ams427ap24.c  |    1 -
 .../drm/panel/panel-samsung-s6e8fc0-m1906f9.c |    1 -
 drivers/gpu/drm/panel/panel-sitronix-st7703.c |    1 -
 drivers/gpu/drm/panel/panel-summit.c          |    1 -
 .../gpu/drm/panel/panel-visionox-rm69299.c    |    1 -
 .../gpu/drm/panel/panel-visionox-rm692e5.c    |    1 -
 .../gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c    |    1 -
 .../gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c  |    1 -
 drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c |    1 -
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |    1 -
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c   |    1 -
 drivers/gpu/drm/sprd/sprd_drm.c               |    1 -
 drivers/gpu/drm/sti/sti_hda.c                 |    1 -
 drivers/gpu/drm/stm/drv.c                     |    1 -
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c         |    1 -
 drivers/gpu/drm/sun4i/sun6i_drc.c             |    1 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c           |    1 -
 drivers/gpu/drm/tiny/sharp-memory.c           |    1 -
 drivers/gpu/drm/vc4/vc4_dpi.c                 |    1 -
 drivers/gpu/drm/vc4/vc4_txp.c                 |    1 -
 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c      |    1 -
 drivers/hid/intel-ish-hid/ishtp/bus.h         |    2 +-
 drivers/hsi/controllers/omap_ssi_port.c       |    1 -
 drivers/hte/hte-tegra194-test.c               |    1 -
 drivers/hwmon/adcxx.c                         |    1 -
 drivers/hwmon/adt7410.c                       |    1 -
 drivers/hwmon/adt7462.c                       |    1 -
 drivers/hwmon/adt7475.c                       |    1 -
 drivers/hwmon/as370-hwmon.c                   |    1 -
 drivers/hwmon/axi-fan-control.c               |    1 -
 drivers/hwmon/cros_ec_hwmon.c                 |    1 -
 drivers/hwmon/gxp-fan-ctrl.c                  |    1 -
 drivers/hwmon/iio_hwmon.c                     |    1 -
 drivers/hwmon/intel-m10-bmc-hwmon.c           |    1 -
 drivers/hwmon/jc42.c                          |    1 -
 drivers/hwmon/lan966x-hwmon.c                 |    1 -
 drivers/hwmon/lm70.c                          |    1 -
 drivers/hwmon/lm75.c                          |    1 -
 drivers/hwmon/ltc2947-core.c                  |    1 -
 drivers/hwmon/ltc4282.c                       |    1 -
 drivers/hwmon/ltc4283.c                       |    1 -
 drivers/hwmon/ltq-cputemp.c                   |    1 -
 drivers/hwmon/max197.c                        |    1 -
 drivers/hwmon/mc13783-adc.c                   |    1 -
 drivers/hwmon/mr75203.c                       |    1 -
 drivers/hwmon/ntc_thermistor.c                |    1 -
 drivers/hwmon/occ/p9_sbe.c                    |    1 -
 drivers/hwmon/pmbus/adp1050.c                 |    1 -
 drivers/hwmon/pmbus/e50sn12051.c              |    1 -
 drivers/hwmon/pmbus/lt3074.c                  |    1 -
 drivers/hwmon/pmbus/max17616.c                |    1 -
 drivers/hwmon/pmbus/max20830.c                |    1 -
 drivers/hwmon/pmbus/mp2975.c                  |    1 -
 drivers/hwmon/pmbus/stef48h28.c               |    1 -
 drivers/hwmon/pwm-fan.c                       |    1 -
 drivers/hwmon/sch5627.c                       |    1 -
 drivers/hwmon/sch5636.c                       |    1 -
 drivers/hwmon/sl28cpld-hwmon.c                |    1 -
 drivers/hwmon/smpro-hwmon.c                   |    1 -
 drivers/hwmon/sparx5-temp.c                   |    1 -
 drivers/hwmon/tmp102.c                        |    1 -
 drivers/hwmon/tmp108.c                        |    1 -
 drivers/hwtracing/coresight/ultrasoc-smb.c    |    1 -
 drivers/i2c/busses/i2c-amd-asf-plat.c         |    1 -
 drivers/i2c/busses/i2c-gxp.c                  |    1 -
 drivers/i2c/busses/i2c-hisi.c                 |    1 -
 drivers/i2c/busses/i2c-rtl9300.c              |    1 -
 drivers/i2c/busses/i2c-rzv2m.c                |    1 -
 drivers/i2c/i2c-core.h                        |    1 +
 drivers/iio/accel/adxl313_i2c.c               |    1 -
 drivers/iio/accel/adxl313_spi.c               |    1 -
 drivers/iio/accel/adxl355_core.c              |    1 -
 drivers/iio/accel/adxl355_i2c.c               |    1 -
 drivers/iio/accel/adxl355_spi.c               |    1 -
 drivers/iio/accel/adxl367.c                   |    1 -
 drivers/iio/accel/adxl367_i2c.c               |    1 -
 drivers/iio/accel/adxl367_spi.c               |    1 -
 drivers/iio/accel/adxl372_i2c.c               |    1 -
 drivers/iio/accel/adxl372_spi.c               |    1 -
 drivers/iio/accel/adxl380_i2c.c               |    1 -
 drivers/iio/accel/adxl380_spi.c               |    1 -
 drivers/iio/accel/bma180.c                    |    1 -
 drivers/iio/accel/bma220_core.c               |    1 -
 drivers/iio/accel/bma220_i2c.c                |    1 -
 drivers/iio/accel/bma220_spi.c                |    1 -
 drivers/iio/accel/bma400_i2c.c                |    1 -
 drivers/iio/accel/bma400_spi.c                |    1 -
 drivers/iio/accel/bmc150-accel-i2c.c          |    1 -
 drivers/iio/accel/bmc150-accel-spi.c          |    1 -
 drivers/iio/accel/bmi088-accel-i2c.c          |    1 -
 drivers/iio/accel/dmard06.c                   |    1 -
 drivers/iio/accel/fxls8962af-core.c           |    1 -
 drivers/iio/accel/fxls8962af-i2c.c            |    1 -
 drivers/iio/accel/fxls8962af-spi.c            |    1 -
 drivers/iio/accel/hid-sensor-accel-3d.c       |    1 -
 drivers/iio/accel/kxcjk-1013.c                |    1 -
 drivers/iio/accel/kxsd9-i2c.c                 |    1 -
 drivers/iio/accel/kxsd9-spi.c                 |    1 -
 drivers/iio/accel/mma7660.c                   |    1 -
 drivers/iio/accel/mma8452.c                   |    1 -
 drivers/iio/accel/mma9551.c                   |    1 -
 drivers/iio/accel/mma9553.c                   |    1 -
 drivers/iio/accel/msa311.c                    |    1 -
 drivers/iio/accel/mxc4005.c                   |    1 -
 drivers/iio/accel/mxc6255.c                   |    1 -
 drivers/iio/accel/st_accel_i2c.c              |    1 -
 drivers/iio/accel/st_accel_spi.c              |    1 -
 drivers/iio/accel/stk8ba50.c                  |    1 -
 drivers/iio/adc/88pm886-gpadc.c               |    1 -
 drivers/iio/adc/ad4000.c                      |    1 -
 drivers/iio/adc/ad4080.c                      |    1 -
 drivers/iio/adc/ad4134.c                      |    1 -
 drivers/iio/adc/ad4851.c                      |    1 -
 drivers/iio/adc/ad7124.c                      |    1 -
 drivers/iio/adc/ad7173.c                      |    1 -
 drivers/iio/adc/ad7191.c                      |    1 -
 drivers/iio/adc/ad7192.c                      |    1 -
 drivers/iio/adc/ad7280a.c                     |    1 -
 drivers/iio/adc/ad7292.c                      |    1 -
 drivers/iio/adc/ad7298.c                      |    1 -
 drivers/iio/adc/ad7405.c                      |    1 -
 drivers/iio/adc/ad7606_par.c                  |    1 -
 drivers/iio/adc/ad7625.c                      |    1 -
 drivers/iio/adc/ad7779.c                      |    1 -
 drivers/iio/adc/adi-axi-adc.c                 |    1 -
 drivers/iio/adc/at91-sama5d2_adc.c            |    1 -
 drivers/iio/adc/axp20x_adc.c                  |    1 -
 drivers/iio/adc/bcm_iproc_adc.c               |    1 -
 drivers/iio/adc/berlin2-adc.c                 |    1 -
 drivers/iio/adc/cpcap-adc.c                   |    1 -
 drivers/iio/adc/envelope-detector.c           |    1 -
 drivers/iio/adc/fsl-imx25-gcq.c               |    1 -
 drivers/iio/adc/hi8435.c                      |    1 -
 drivers/iio/adc/hx711.c                       |    1 -
 drivers/iio/adc/imx7d_adc.c                   |    1 -
 drivers/iio/adc/imx8qxp-adc.c                 |    1 -
 drivers/iio/adc/imx93_adc.c                   |    1 -
 drivers/iio/adc/ingenic-adc.c                 |    1 -
 drivers/iio/adc/intel_dc_ti_adc.c             |    1 -
 drivers/iio/adc/intel_mrfld_adc.c             |    1 -
 drivers/iio/adc/lpc18xx_adc.c                 |    1 -
 drivers/iio/adc/lpc32xx_adc.c                 |    1 -
 drivers/iio/adc/ltc2496.c                     |    1 -
 drivers/iio/adc/ltc2497.c                     |    1 -
 drivers/iio/adc/max1027.c                     |    1 -
 drivers/iio/adc/max11100.c                    |    1 -
 drivers/iio/adc/max1118.c                     |    1 -
 drivers/iio/adc/max1363.c                     |    1 -
 drivers/iio/adc/max14001.c                    |    1 -
 drivers/iio/adc/max34408.c                    |    1 -
 drivers/iio/adc/max77541-adc.c                |    1 -
 drivers/iio/adc/max9611.c                     |    1 -
 drivers/iio/adc/mcp320x.c                     |    1 -
 drivers/iio/adc/mcp3422.c                     |    1 -
 drivers/iio/adc/mcp3911.c                     |    1 -
 drivers/iio/adc/mp2629_adc.c                  |    1 -
 drivers/iio/adc/mt6359-auxadc.c               |    1 -
 drivers/iio/adc/mt6360-adc.c                  |    1 -
 drivers/iio/adc/mt6370-adc.c                  |    1 -
 drivers/iio/adc/mt6577_auxadc.c               |    1 -
 drivers/iio/adc/nau7802.c                     |    1 -
 drivers/iio/adc/nct7201.c                     |    1 -
 drivers/iio/adc/npcm_adc.c                    |    1 -
 drivers/iio/adc/nxp-sar-adc.c                 |    1 -
 drivers/iio/adc/qcom-pm8xxx-xoadc.c           |    1 -
 drivers/iio/adc/qcom-spmi-adc5-gen3.c         |    1 -
 drivers/iio/adc/qcom-spmi-adc5.c              |    1 -
 drivers/iio/adc/qcom-spmi-rradc.c             |    1 -
 drivers/iio/adc/qcom-spmi-vadc.c              |    1 -
 drivers/iio/adc/rohm-bd79112.c                |    1 -
 drivers/iio/adc/rohm-bd79124.c                |    1 -
 drivers/iio/adc/rtq6056.c                     |    1 -
 drivers/iio/adc/rzg2l_adc.c                   |    1 -
 drivers/iio/adc/rzn1-adc.c                    |    1 -
 drivers/iio/adc/rzt2h_adc.c                   |    1 -
 drivers/iio/adc/sd_adc_modulator.c            |    1 -
 drivers/iio/adc/sophgo-cv1800b-adc.c          |    1 -
 drivers/iio/adc/spear_adc.c                   |    1 -
 drivers/iio/adc/stm32-adc.c                   |    1 -
 drivers/iio/adc/sun20i-gpadc-iio.c            |    1 -
 drivers/iio/adc/ti-adc081c.c                  |    1 -
 drivers/iio/adc/ti-adc0832.c                  |    1 -
 drivers/iio/adc/ti-adc084s021.c               |    1 -
 drivers/iio/adc/ti-adc108s102.c               |    1 -
 drivers/iio/adc/ti-adc128s052.c               |    1 -
 drivers/iio/adc/ti-adc161s626.c               |    1 -
 drivers/iio/adc/ti-ads1018.c                  |    1 -
 drivers/iio/adc/ti-ads124s08.c                |    1 -
 drivers/iio/adc/ti-ads131m02.c                |    1 -
 drivers/iio/adc/ti-ads8688.c                  |    1 -
 drivers/iio/adc/ti-tlc4541.c                  |    1 -
 drivers/iio/adc/twl4030-madc.c                |    1 -
 drivers/iio/adc/twl6030-gpadc.c               |    1 -
 drivers/iio/adc/vf610_adc.c                   |    1 -
 drivers/iio/adc/xilinx-ams.c                  |    1 -
 drivers/iio/adc/xilinx-xadc-core.c            |    1 -
 drivers/iio/addac/ad74413r.c                  |    1 -
 drivers/iio/afe/iio-rescale.c                 |    1 -
 drivers/iio/amplifiers/ad8366.c               |    1 -
 drivers/iio/amplifiers/adl8113.c              |    1 -
 drivers/iio/amplifiers/hmc425a.c              |    1 -
 drivers/iio/cdc/ad7150.c                      |    1 -
 drivers/iio/chemical/ams-iaq-core.c           |    1 -
 drivers/iio/chemical/atlas-ezo-sensor.c       |    1 -
 drivers/iio/chemical/atlas-sensor.c           |    1 -
 drivers/iio/chemical/bme680_spi.c             |    1 -
 drivers/iio/chemical/mhz19b.c                 |    1 -
 drivers/iio/chemical/pms7003.c                |    1 -
 drivers/iio/chemical/scd30_i2c.c              |    1 -
 drivers/iio/chemical/scd30_serial.c           |    1 -
 drivers/iio/chemical/sgp30.c                  |    1 -
 drivers/iio/chemical/sps30_i2c.c              |    1 -
 drivers/iio/chemical/sps30_serial.c           |    1 -
 drivers/iio/chemical/sunrise_co2.c            |    1 -
 drivers/iio/chemical/vz89x.c                  |    1 -
 .../cros_ec_sensors/cros_ec_lid_angle.c       |    1 -
 .../common/cros_ec_sensors/cros_ec_sensors.c  |    1 -
 drivers/iio/common/ssp_sensors/ssp_dev.c      |    1 -
 drivers/iio/dac/ad3530r.c                     |    1 -
 drivers/iio/dac/ad3552r-hs.c                  |    1 -
 drivers/iio/dac/ad5446-i2c.c                  |    1 -
 drivers/iio/dac/ad5446-spi.c                  |    1 -
 drivers/iio/dac/ad5592r.c                     |    1 -
 drivers/iio/dac/ad5593r.c                     |    1 -
 drivers/iio/dac/ad5758.c                      |    1 -
 drivers/iio/dac/ad7293.c                      |    1 -
 drivers/iio/dac/ad7303.c                      |    1 -
 drivers/iio/dac/ad8460.c                      |    1 -
 drivers/iio/dac/ad9739a.c                     |    1 -
 drivers/iio/dac/adi-axi-dac.c                 |    1 -
 drivers/iio/dac/dpot-dac.c                    |    1 -
 drivers/iio/dac/lpc18xx_dac.c                 |    1 -
 drivers/iio/dac/ltc2664.c                     |    1 -
 drivers/iio/dac/ltc2688.c                     |    1 -
 drivers/iio/dac/max22007.c                    |    1 -
 drivers/iio/dac/max5522.c                     |    1 -
 drivers/iio/dac/mcp4725.c                     |    1 -
 drivers/iio/dac/mcp4728.c                     |    1 -
 drivers/iio/dac/mcp47feb02.c                  |    1 -
 drivers/iio/dac/mcp4821.c                     |    1 -
 drivers/iio/dac/stm32-dac-core.c              |    1 -
 drivers/iio/dac/stm32-dac.c                   |    1 -
 drivers/iio/dac/ti-dac082s085.c               |    1 -
 drivers/iio/dac/ti-dac5571.c                  |    1 -
 drivers/iio/dac/vf610_dac.c                   |    1 -
 drivers/iio/filter/admv8818.c                 |    1 -
 drivers/iio/frequency/adf4350.c               |    1 -
 drivers/iio/frequency/admfm2000.c             |    1 -
 drivers/iio/frequency/admv1013.c              |    1 -
 drivers/iio/frequency/admv1014.c              |    1 -
 drivers/iio/frequency/adrf6780.c              |    1 -
 drivers/iio/gyro/bmg160_i2c.c                 |    1 -
 drivers/iio/gyro/fxas21002c_i2c.c             |    1 -
 drivers/iio/gyro/fxas21002c_spi.c             |    1 -
 drivers/iio/gyro/hid-sensor-gyro-3d.c         |    1 -
 drivers/iio/gyro/st_gyro_i2c.c                |    1 -
 drivers/iio/gyro/st_gyro_spi.c                |    1 -
 drivers/iio/health/max30102.c                 |    1 -
 drivers/iio/humidity/dht11.c                  |    1 -
 drivers/iio/humidity/ens210.c                 |    1 -
 drivers/iio/humidity/hdc100x.c                |    1 -
 drivers/iio/humidity/hid-sensor-humidity.c    |    1 -
 drivers/iio/humidity/hts221_i2c.c             |    1 -
 drivers/iio/humidity/htu21.c                  |    1 -
 drivers/iio/humidity/si7020.c                 |    1 -
 drivers/iio/imu/adis16475.c                   |    1 -
 drivers/iio/imu/adis16480.c                   |    1 -
 drivers/iio/imu/adis16550.c                   |    1 -
 drivers/iio/imu/bmi160/bmi160_i2c.c           |    1 -
 drivers/iio/imu/bmi160/bmi160_spi.c           |    1 -
 drivers/iio/imu/bmi270/bmi270_i2c.c           |    1 -
 drivers/iio/imu/bmi270/bmi270_spi.c           |    1 -
 drivers/iio/imu/bmi323/bmi323_i2c.c           |    1 -
 drivers/iio/imu/bmi323/bmi323_spi.c           |    1 -
 drivers/iio/imu/bno055/bno055_i2c.c           |    1 -
 drivers/iio/imu/bno055/bno055_ser_core.c      |    1 -
 drivers/iio/imu/fxos8700_i2c.c                |    1 -
 drivers/iio/imu/fxos8700_spi.c                |    1 -
 .../iio/imu/inv_icm42600/inv_icm42600_i2c.c   |    1 -
 .../iio/imu/inv_icm42600/inv_icm42600_spi.c   |    1 -
 .../iio/imu/inv_icm45600/inv_icm45600_i2c.c   |    1 -
 .../iio/imu/inv_icm45600/inv_icm45600_i3c.c   |    1 -
 .../iio/imu/inv_icm45600/inv_icm45600_spi.c   |    1 -
 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c     |    1 -
 drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c     |    1 -
 drivers/iio/imu/kmx61.c                       |    1 -
 drivers/iio/imu/smi330/smi330_i2c.c           |    1 -
 drivers/iio/imu/smi330/smi330_spi.c           |    1 -
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c   |    1 -
 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c   |    1 -
 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c   |    1 -
 drivers/iio/light/al3000a.c                   |    1 -
 drivers/iio/light/al3010.c                    |    1 -
 drivers/iio/light/al3320a.c                   |    1 -
 drivers/iio/light/bh1780.c                    |    1 -
 drivers/iio/light/cm32181.c                   |    1 -
 drivers/iio/light/cm3232.c                    |    1 -
 drivers/iio/light/cm3605.c                    |    1 -
 drivers/iio/light/cros_ec_light_prox.c        |    1 -
 drivers/iio/light/gp2ap020a00f.c              |    1 -
 drivers/iio/light/hid-sensor-als.c            |    1 -
 drivers/iio/light/hid-sensor-prox.c           |    1 -
 drivers/iio/light/isl29018.c                  |    1 -
 drivers/iio/light/jsa1212.c                   |    1 -
 drivers/iio/light/ltr501.c                    |    1 -
 drivers/iio/light/ltrf216a.c                  |    1 -
 drivers/iio/light/max44000.c                  |    1 -
 drivers/iio/light/opt3001.c                   |    1 -
 drivers/iio/light/rpr0521.c                   |    1 -
 drivers/iio/light/st_uvis25_i2c.c             |    1 -
 drivers/iio/light/st_uvis25_spi.c             |    1 -
 drivers/iio/light/stk3310.c                   |    1 -
 drivers/iio/light/tsl2563.c                   |    1 -
 drivers/iio/light/us5182d.c                   |    1 -
 drivers/iio/light/veml6046x00.c               |    1 -
 drivers/iio/light/vl6180.c                    |    1 -
 drivers/iio/magnetometer/ak8974.c             |    1 -
 drivers/iio/magnetometer/ak8975.c             |    1 -
 drivers/iio/magnetometer/bmc150_magn_i2c.c    |    1 -
 drivers/iio/magnetometer/bmc150_magn_spi.c    |    1 -
 drivers/iio/magnetometer/hid-sensor-magn-3d.c |    1 -
 drivers/iio/magnetometer/mmc35240.c           |    1 -
 drivers/iio/magnetometer/mmc5633.c            |    1 -
 drivers/iio/magnetometer/si7210.c             |    1 -
 drivers/iio/magnetometer/st_magn_i2c.c        |    1 -
 drivers/iio/magnetometer/st_magn_spi.c        |    1 -
 drivers/iio/magnetometer/tlv493d.c            |    1 -
 drivers/iio/magnetometer/yamaha-yas530.c      |    1 -
 drivers/iio/multiplexer/iio-mux.c             |    1 -
 drivers/iio/orientation/hid-sensor-incl-3d.c  |    1 -
 drivers/iio/orientation/hid-sensor-rotation.c |    1 -
 .../position/hid-sensor-custom-intel-hinge.c  |    1 -
 drivers/iio/potentiometer/ad5272.c            |    1 -
 drivers/iio/potentiometer/ds1803.c            |    1 -
 drivers/iio/potentiometer/max5432.c           |    1 -
 drivers/iio/potentiometer/max5481.c           |    1 -
 drivers/iio/potentiometer/max5487.c           |    1 -
 drivers/iio/potentiometer/mcp4018.c           |    1 -
 drivers/iio/potentiometer/mcp41010.c          |    1 -
 drivers/iio/potentiometer/mcp4131.c           |    1 -
 drivers/iio/potentiometer/mcp4531.c           |    1 -
 drivers/iio/potentiostat/lmp91000.c           |    1 -
 drivers/iio/pressure/abp2030pa_i2c.c          |    1 -
 drivers/iio/pressure/abp2030pa_spi.c          |    1 -
 drivers/iio/pressure/adp810.c                 |    1 -
 drivers/iio/pressure/cros_ec_baro.c           |    1 -
 drivers/iio/pressure/hid-sensor-press.c       |    1 -
 drivers/iio/pressure/hp206c.c                 |    1 -
 drivers/iio/pressure/hsc030pa.c               |    1 -
 drivers/iio/pressure/hsc030pa_i2c.c           |    1 -
 drivers/iio/pressure/hsc030pa_spi.c           |    1 -
 drivers/iio/pressure/icp10100.c               |    1 -
 drivers/iio/pressure/mprls0025pa.c            |    1 -
 drivers/iio/pressure/mprls0025pa_i2c.c        |    1 -
 drivers/iio/pressure/mprls0025pa_spi.c        |    1 -
 drivers/iio/pressure/ms5611_i2c.c             |    1 -
 drivers/iio/pressure/ms5611_spi.c             |    1 -
 drivers/iio/pressure/ms5637.c                 |    1 -
 drivers/iio/pressure/sdp500.c                 |    1 -
 drivers/iio/pressure/st_pressure_i2c.c        |    1 -
 drivers/iio/pressure/st_pressure_spi.c        |    1 -
 drivers/iio/pressure/zpa2326_i2c.c            |    1 -
 drivers/iio/pressure/zpa2326_spi.c            |    1 -
 drivers/iio/proximity/as3935.c                |    1 -
 .../iio/proximity/cros_ec_mkbp_proximity.c    |    1 -
 drivers/iio/proximity/d3323aa.c               |    1 -
 drivers/iio/proximity/hx9023s.c               |    1 -
 drivers/iio/proximity/isl29501.c              |    1 -
 drivers/iio/proximity/mb1232.c                |    1 -
 drivers/iio/proximity/ping.c                  |    1 -
 .../iio/proximity/pulsedlight-lidar-lite-v2.c |    1 -
 drivers/iio/proximity/srf04.c                 |    1 -
 drivers/iio/proximity/sx9310.c                |    1 -
 drivers/iio/proximity/sx9324.c                |    1 -
 drivers/iio/proximity/sx9360.c                |    1 -
 drivers/iio/proximity/vl53l1x-i2c.c           |    1 -
 drivers/iio/resolver/ad2s1200.c               |    1 -
 .../iio/temperature/hid-sensor-temperature.c  |    1 -
 drivers/iio/temperature/ltc2983.c             |    1 -
 drivers/iio/temperature/max31856.c            |    1 -
 drivers/iio/temperature/max31865.c            |    1 -
 drivers/iio/temperature/maxim_thermocouple.c  |    1 -
 drivers/iio/temperature/mcp9600.c             |    1 -
 drivers/iio/temperature/mlx90614.c            |    1 -
 drivers/iio/temperature/mlx90632.c            |    1 -
 drivers/iio/temperature/mlx90635.c            |    1 -
 drivers/iio/temperature/tmp006.c              |    1 -
 drivers/iio/temperature/tmp007.c              |    1 -
 drivers/iio/temperature/tsys01.c              |    1 -
 drivers/iio/trigger/stm32-lptimer-trigger.c   |    1 -
 drivers/iio/trigger/stm32-timer-trigger.c     |    1 -
 drivers/input/keyboard/adp5585-keys.c         |    1 -
 drivers/input/keyboard/adp5588-keys.c         |    1 -
 drivers/input/keyboard/charlieplex_keypad.c   |    1 -
 drivers/input/keyboard/clps711x-keypad.c      |    1 -
 drivers/input/keyboard/ep93xx_keypad.c        |    1 -
 drivers/input/keyboard/max7360-keypad.c       |    1 -
 drivers/input/keyboard/pinephone-keyboard.c   |    1 -
 drivers/input/misc/ariel-pwrbutton.c          |    1 -
 drivers/input/misc/da9063_onkey.c             |    1 -
 drivers/input/misc/gpio_decoder.c             |    1 -
 drivers/input/misc/iqs269a.c                  |    1 -
 drivers/input/misc/iqs626a.c                  |    1 -
 drivers/input/misc/iqs7222.c                  |    1 -
 drivers/input/misc/mma8450.c                  |    1 -
 drivers/input/misc/rt5120-pwrkey.c            |    1 -
 drivers/input/misc/sc27xx-vibra.c             |    1 -
 drivers/input/misc/twl4030-pwrbutton.c        |    1 -
 drivers/input/serio/sun4i-ps2.c               |    1 -
 drivers/input/serio/xilinx_ps2.c              |    1 -
 drivers/input/touchscreen/cyttsp5.c           |    1 -
 drivers/input/touchscreen/himax_hx852x.c      |    1 -
 drivers/input/touchscreen/hynitron_cstxxx.c   |    1 -
 drivers/input/touchscreen/ili210x.c           |    1 -
 drivers/input/touchscreen/iqs5xx.c            |    1 -
 drivers/input/touchscreen/msg2638.c           |    1 -
 .../input/touchscreen/resistive-adc-touch.c   |    1 -
 drivers/input/touchscreen/tsc2007_core.c      |    1 -
 drivers/interconnect/mediatek/mt8183.c        |    1 -
 drivers/interconnect/mediatek/mt8195.c        |    1 -
 drivers/interconnect/mediatek/mt8196.c        |    1 -
 drivers/interconnect/qcom/msm8909.c           |    1 -
 drivers/interconnect/qcom/msm8937.c           |    1 -
 drivers/interconnect/qcom/msm8939.c           |    1 -
 drivers/interconnect/qcom/msm8953.c           |    1 -
 drivers/interconnect/qcom/msm8976.c           |    1 -
 drivers/interconnect/qcom/msm8996.c           |    1 -
 drivers/interconnect/qcom/qcm2290.c           |    1 -
 drivers/interconnect/qcom/qcs404.c            |    1 -
 drivers/interconnect/qcom/qdu1000.c           |    1 -
 drivers/interconnect/qcom/sa8775p.c           |    1 -
 drivers/interconnect/qcom/sc7180.c            |    1 -
 drivers/interconnect/qcom/sc7280.c            |    1 -
 drivers/interconnect/qcom/sc8180x.c           |    1 -
 drivers/interconnect/qcom/sc8280xp.c          |    1 -
 drivers/interconnect/qcom/sdm660.c            |    1 -
 drivers/interconnect/qcom/sdm670.c            |    1 -
 drivers/interconnect/qcom/sdm845.c            |    1 -
 drivers/interconnect/qcom/sdx55.c             |    1 -
 drivers/interconnect/qcom/sdx65.c             |    1 -
 drivers/interconnect/qcom/sm6115.c            |    1 -
 drivers/interconnect/qcom/sm6350.c            |    1 -
 drivers/interconnect/qcom/sm7150.c            |    1 -
 drivers/interconnect/qcom/sm8150.c            |    1 -
 drivers/interconnect/qcom/sm8250.c            |    1 -
 drivers/interconnect/qcom/sm8350.c            |    1 -
 drivers/interconnect/qcom/sm8450.c            |    1 -
 drivers/interconnect/qcom/sm8550.c            |    1 -
 .../iommu/arm/arm-smmu/arm-smmu-qcom-debug.c  |    1 -
 drivers/irqchip/irq-imx-intmux.c              |    1 -
 drivers/irqchip/irq-lan966x-oic.c             |    1 -
 drivers/irqchip/irq-sl28cpld.c                |    1 -
 drivers/irqchip/irq-stm32mp-exti.c            |    1 -
 drivers/leds/flash/leds-rt8515.c              |    1 -
 drivers/leds/leds-aw200xx.c                   |    1 -
 drivers/leds/leds-bd2606mvv.c                 |    1 -
 drivers/leds/leds-cht-wcove.c                 |    1 -
 drivers/leds/leds-cr0014114.c                 |    1 -
 drivers/leds/leds-cros_ec.c                   |    1 -
 drivers/leds/leds-el15203000.c                |    1 -
 drivers/leds/leds-gpio.c                      |    1 -
 drivers/leds/leds-is31fl319x.c                |    1 -
 drivers/leds/leds-lm36274.c                   |    1 -
 drivers/leds/leds-lm3692x.c                   |    1 -
 drivers/leds/leds-lm3697.c                    |    1 -
 drivers/leds/leds-lp50xx.c                    |    1 -
 drivers/leds/leds-lt3593.c                    |    1 -
 drivers/leds/leds-max5970.c                   |    1 -
 drivers/leds/leds-mlxcpld.c                   |    1 -
 drivers/leds/leds-nic78bx.c                   |    1 -
 drivers/leds/leds-pca995x.c                   |    1 -
 drivers/leds/leds-regulator.c                 |    1 -
 drivers/leds/leds-spi-byte.c                  |    1 -
 drivers/leds/leds-sun50i-a100.c               |    1 -
 drivers/leds/rgb/leds-group-multicolor.c      |    1 -
 drivers/leds/rgb/leds-mt6370-rgb.c            |    1 -
 drivers/leds/rgb/leds-pwm-multicolor.c        |    1 -
 drivers/mailbox/mailbox-mpfs.c                |    1 -
 drivers/mailbox/platform_mhu.c                |    1 -
 .../media/cec/platform/cros-ec/cros-ec-cec.c  |    1 -
 drivers/media/firewire/firedtv-fw.c           |    1 -
 drivers/media/i2c/adv7180.c                   |    1 -
 drivers/media/i2c/cvs/core.c                  |    1 -
 drivers/media/i2c/gc0308.c                    |    1 -
 drivers/media/i2c/gc05a2.c                    |    1 -
 drivers/media/i2c/gc08a3.c                    |    1 -
 drivers/media/i2c/lm3560.c                    |    1 -
 drivers/media/i2c/mt9m114.c                   |    1 -
 drivers/media/i2c/mt9p031.c                   |    1 -
 drivers/media/i2c/mt9v032.c                   |    1 -
 drivers/media/i2c/ov2680.c                    |    1 -
 drivers/media/i2c/ov5640.c                    |    1 -
 drivers/media/i2c/ov5670.c                    |    1 -
 drivers/media/i2c/ov5675.c                    |    1 -
 drivers/media/i2c/ov64a40.c                   |    1 -
 drivers/media/i2c/ov7251.c                    |    1 -
 drivers/media/i2c/ov7670.c                    |    1 -
 drivers/media/i2c/ov8865.c                    |    1 -
 drivers/media/i2c/t4ka3.c                     |    1 -
 drivers/media/i2c/tvp514x.c                   |    1 -
 drivers/media/i2c/video-i2c.c                 |    1 -
 .../platform/arm/mali-c55/mali-c55-core.c     |    1 -
 .../platform/chips-media/coda/imx-vdoa.c      |    1 -
 .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c  |    1 -
 .../platform/microchip/microchip-csi2dc.c     |    1 -
 drivers/media/platform/qcom/venus/vdec.c      |    1 -
 drivers/media/platform/qcom/venus/venc.c      |    1 -
 drivers/media/platform/renesas/rcar-fcp.c     |    1 -
 .../platform/renesas/rzg2l-cru/rzg2l-core.c   |    1 -
 drivers/media/platform/st/sti/hva/hva-v4l2.c  |    1 -
 .../media/platform/sunxi/sun8i-di/sun8i-di.c  |    1 -
 .../sunxi/sun8i-rotate/sun8i_rotate.c         |    1 -
 drivers/media/platform/ti/vpe/vip.c           |    1 +
 drivers/media/rc/ir-spi.c                     |    1 -
 drivers/media/usb/em28xx/em28xx.h             |    1 +
 drivers/memory/stm32_omm.c                    |    1 -
 drivers/memory/tegra/tegra186-emc.c           |    1 -
 drivers/memory/tegra/tegra186.c               |    1 -
 drivers/memory/tegra/tegra210-emc-core.c      |    1 -
 drivers/mfd/adp5585.c                         |    1 -
 drivers/mfd/atmel-hlcdc.c                     |    1 -
 drivers/mfd/atmel-smc.c                       |    1 -
 drivers/mfd/cros_ec_dev.c                     |    1 -
 drivers/mfd/cs42l43-i2c.c                     |    1 -
 drivers/mfd/cs42l43-sdw.c                     |    1 -
 drivers/mfd/hi655x-pmic.c                     |    1 -
 drivers/mfd/intel-lpss-acpi.c                 |    1 -
 drivers/mfd/intel-lpss-pci.c                  |    1 -
 drivers/mfd/intel_soc_pmic_bxtwc.c            |    1 -
 drivers/mfd/intel_soc_pmic_crc.c              |    1 -
 drivers/mfd/kempld-core.c                     |    1 -
 drivers/mfd/lochnagar-i2c.c                   |    1 -
 drivers/mfd/lp873x.c                          |    2 +-
 drivers/mfd/lp87565.c                         |    1 -
 drivers/mfd/max14577.c                        |    1 -
 drivers/mfd/max7360.c                         |    1 -
 drivers/mfd/max77759.c                        |    1 -
 drivers/mfd/max77843.c                        |    1 -
 drivers/mfd/mc13xxx-spi.c                     |    1 -
 drivers/mfd/motorola-cpcap.c                  |    1 -
 drivers/mfd/ocelot-spi.c                      |    1 -
 drivers/mfd/rt5033.c                          |    3 +-
 drivers/mfd/rt5120.c                          |    1 -
 drivers/mfd/rz-mtu3.c                         |    1 -
 drivers/mfd/sec-acpm.c                        |    1 -
 drivers/mfd/sec-i2c.c                         |    1 -
 drivers/mfd/simple-mfd-i2c.c                  |    1 -
 drivers/mfd/tps6594-i2c.c                     |    1 -
 drivers/mfd/tps6594-spi.c                     |    1 -
 drivers/mfd/upboard-fpga.c                    |    1 -
 drivers/mfd/wm831x-core.c                     |    2 +-
 drivers/misc/eeprom/at24.c                    |    1 -
 drivers/misc/eeprom/ee1004.c                  |    1 -
 drivers/misc/eeprom/eeprom_93xx46.c           |    1 -
 drivers/misc/eeprom/idt_89hpesx.c             |    1 -
 drivers/misc/hisi_hikey_usb.c                 |    1 -
 drivers/misc/pvpanic/pvpanic-mmio.c           |    1 -
 drivers/misc/pvpanic/pvpanic.c                |    1 -
 drivers/misc/smpro-errmon.c                   |    1 -
 drivers/misc/smpro-misc.c                     |    1 -
 drivers/mmc/host/litex_mmc.c                  |    1 -
 drivers/mmc/host/owl-mmc.c                    |    1 -
 drivers/mmc/host/renesas_sdhi_internal_dmac.c |    1 -
 drivers/mmc/host/renesas_sdhi_sys_dmac.c      |    1 -
 drivers/mmc/host/sdhci-npcm.c                 |    1 -
 drivers/mmc/host/sdhci-of-ma35d1.c            |    1 -
 drivers/mmc/host/sh_mmcif.c                   |    1 -
 drivers/mmc/host/sunxi-mmc.c                  |    1 -
 drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c  |    1 -
 drivers/mux/adgs1408.c                        |    1 -
 drivers/mux/gpio.c                            |    1 -
 drivers/net/can/spi/hi311x.c                  |    1 -
 .../net/can/spi/mcp251xfd/mcp251xfd-core.c    |    1 -
 drivers/net/dsa/microchip/ksz8863_smi.c       |    2 +-
 drivers/net/dsa/mt7530-mmio.c                 |    1 -
 drivers/net/dsa/ocelot/seville_vsc9953.c      |    1 -
 drivers/net/ethernet/calxeda/xgmac.c          |    1 -
 drivers/net/ethernet/ezchip/nps_enet.c        |    1 -
 drivers/net/ethernet/faraday/ftmac100.c       |    1 -
 .../net/ethernet/freescale/dpaa/dpaa_eth.c    |    1 -
 .../net/ethernet/freescale/enetc/enetc_ierb.c |    1 -
 drivers/net/ethernet/ibm/emac/tah.c           |    1 -
 drivers/net/ethernet/ibm/emac/zmii.c          |    1 -
 drivers/net/ethernet/marvell/mvmdio.c         |    1 -
 .../mellanox/mlxbf_gige/mlxbf_gige_mdio.c     |    1 -
 drivers/net/ethernet/mellanox/mlxsw/i2c.c     |    1 -
 drivers/net/ethernet/mellanox/mlxsw/minimal.c |    1 -
 .../ethernet/stmicro/stmmac/dwmac-nuvoton.c   |    1 -
 .../ethernet/stmicro/stmmac/dwmac-sophgo.c    |    1 -
 .../ethernet/stmicro/stmmac/dwmac-spacemit.c  |    1 -
 .../ethernet/stmicro/stmmac/dwmac-starfive.c  |    1 -
 drivers/net/ethernet/xscale/ptp_ixp46x.c      |    1 -
 drivers/net/ieee802154/mrf24j40.c             |    1 -
 drivers/net/mdio/mdio-realtek-rtl9300.c       |    1 -
 drivers/net/mhi_net.c                         |    1 -
 drivers/net/wan/fsl_qmc_hdlc.c                |    1 -
 drivers/net/wireless/ath/ath9k/ahb.c          |    1 -
 .../broadcom/brcm80211/brcmfmac/dmi.c         |    1 -
 drivers/net/wireless/intersil/p54/p54spi.c    |    1 -
 drivers/net/wireless/ti/wl1251/sdio.c         |    1 -
 drivers/net/wireless/ti/wl12xx/main.c         |    1 -
 drivers/net/wireless/ti/wl18xx/main.c         |    1 -
 drivers/net/wwan/mhi_wwan_ctrl.c              |    1 -
 drivers/net/wwan/mhi_wwan_mbim.c              |    1 -
 drivers/net/wwan/qcom_bam_dmux.c              |    1 -
 drivers/net/wwan/rpmsg_wwan_ctrl.c            |    1 -
 drivers/nfc/microread/mei.c                   |    1 -
 drivers/nfc/pn544/mei.c                       |    1 -
 drivers/nfc/s3fwrn5/uart.c                    |    1 -
 drivers/nvmem/an8855-efuse.c                  |    1 -
 drivers/nvmem/apple-efuses.c                  |    1 -
 drivers/nvmem/brcm_nvram.c                    |    1 -
 drivers/nvmem/layerscape-sfp.c                |    1 -
 drivers/nvmem/lpc18xx_eeprom.c                |    1 -
 drivers/nvmem/max77759-nvmem.c                |    1 -
 drivers/nvmem/mtk-efuse.c                     |    1 -
 drivers/nvmem/nintendo-otp.c                  |    1 -
 drivers/nvmem/qfprom.c                        |    1 -
 drivers/nvmem/qoriq-efuse.c                   |    1 -
 drivers/nvmem/rcar-efuse.c                    |    1 -
 drivers/nvmem/sec-qfprom.c                    |    1 -
 drivers/nvmem/sunplus-ocotp.c                 |    1 -
 drivers/nvmem/u-boot-env.c                    |    1 -
 drivers/nvmem/uniphier-efuse.c                |    1 -
 drivers/of/device.c                           |    1 -
 drivers/pci/controller/cadence/pcie-sg2042.c  |    1 -
 drivers/pci/controller/dwc/pci-exynos.c       |    1 -
 drivers/pci/controller/dwc/pci-meson.c        |    1 -
 drivers/pci/controller/dwc/pcie-intel-gw.c    |    1 -
 drivers/pci/controller/dwc/pcie-keembay.c     |    1 -
 drivers/pci/controller/dwc/pcie-spacemit-k1.c |    1 -
 drivers/pci/controller/dwc/pcie-stm32.c       |    1 -
 drivers/pci/pwrctrl/generic.c                 |    1 -
 drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c      |    1 -
 drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c      |    1 -
 drivers/perf/arm-ccn.c                        |    1 -
 drivers/perf/fujitsu_uncore_pmu.c             |    1 -
 drivers/perf/hisilicon/hisi_uncore_mn_pmu.c   |    1 -
 drivers/perf/hisilicon/hisi_uncore_noc_pmu.c  |    1 -
 drivers/perf/hisilicon/hisi_uncore_uc_pmu.c   |    1 -
 drivers/perf/riscv_pmu_legacy.c               |    1 -
 drivers/perf/riscv_pmu_sbi.c                  |    1 -
 drivers/perf/starfive_starlink_pmu.c          |    1 -
 drivers/phy/allwinner/phy-sun50i-usb3.c       |    1 -
 drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c |    1 -
 drivers/phy/amlogic/phy-meson-axg-pcie.c      |    1 -
 drivers/phy/amlogic/phy-meson-gxl-usb2.c      |    1 -
 drivers/phy/amlogic/phy-meson8b-usb2.c        |    1 -
 drivers/phy/cadence/cdns-dphy-rx.c            |    1 -
 drivers/phy/hisilicon/phy-hi3670-pcie.c       |    1 -
 drivers/phy/hisilicon/phy-hi6220-usb.c        |    1 -
 drivers/phy/intel/phy-intel-keembay-usb.c     |    1 -
 drivers/phy/marvell/phy-mmp3-hsic.c           |    1 -
 drivers/phy/marvell/phy-mmp3-usb.c            |    1 -
 drivers/phy/marvell/phy-mvebu-sata.c          |    1 -
 drivers/phy/mediatek/phy-mtk-ufs.c            |    1 -
 drivers/phy/phy-snps-eusb2.c                  |    1 -
 drivers/phy/qualcomm/phy-ath79-usb.c          |    1 -
 .../phy/rockchip/phy-rockchip-samsung-dcphy.c |    1 -
 drivers/phy/rockchip/phy-rockchip-usbdp.c     |    1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c    |    1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c    |    1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c    |    1 -
 drivers/pinctrl/bcm/pinctrl-bcm4908.c         |    1 -
 drivers/pinctrl/bcm/pinctrl-bcm63xx.c         |    1 -
 drivers/pinctrl/freescale/pinctrl-imx-scmi.c  |    1 -
 drivers/pinctrl/freescale/pinctrl-imx23.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx25.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx27.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx28.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx35.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx50.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx51.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx53.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6dl.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6q.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6sl.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6sll.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx6sx.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx7ulp.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8dxl.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8mq.c    |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8qxp.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx8ulp.c   |    1 -
 drivers/pinctrl/freescale/pinctrl-imx91.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-imx93.c     |    1 -
 drivers/pinctrl/freescale/pinctrl-vf610.c     |    1 -
 drivers/pinctrl/intel/pinctrl-alderlake.c     |    1 -
 drivers/pinctrl/intel/pinctrl-broxton.c       |    1 -
 drivers/pinctrl/intel/pinctrl-cannonlake.c    |    1 -
 drivers/pinctrl/intel/pinctrl-cedarfork.c     |    1 -
 drivers/pinctrl/intel/pinctrl-denverton.c     |    1 -
 drivers/pinctrl/intel/pinctrl-elkhartlake.c   |    1 -
 drivers/pinctrl/intel/pinctrl-emmitsburg.c    |    1 -
 drivers/pinctrl/intel/pinctrl-geminilake.c    |    1 -
 .../pinctrl/intel/pinctrl-intel-platform.c    |    1 -
 drivers/pinctrl/intel/pinctrl-jasperlake.c    |    1 -
 drivers/pinctrl/intel/pinctrl-lakefield.c     |    1 -
 drivers/pinctrl/intel/pinctrl-lewisburg.c     |    1 -
 drivers/pinctrl/intel/pinctrl-merrifield.c    |    1 -
 drivers/pinctrl/intel/pinctrl-meteorlake.c    |    1 -
 drivers/pinctrl/intel/pinctrl-meteorpoint.c   |    1 -
 drivers/pinctrl/intel/pinctrl-moorefield.c    |    1 -
 drivers/pinctrl/intel/pinctrl-sunrisepoint.c  |    1 -
 drivers/pinctrl/intel/pinctrl-tigerlake.c     |    1 -
 .../pinctrl/microchip/pinctrl-mpfs-iomux0.c   |    1 -
 .../pinctrl/microchip/pinctrl-mpfs-mssio.c    |    1 -
 .../pinctrl/microchip/pinctrl-pic64gx-gpio2.c |    1 -
 drivers/pinctrl/nuvoton/pinctrl-ma35d1.c      |    1 -
 drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c     |    1 -
 drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c     |    1 -
 drivers/pinctrl/nuvoton/pinctrl-wpcm450.c     |    1 -
 drivers/pinctrl/pinctrl-as3722.c              |    1 -
 drivers/pinctrl/pinctrl-cy8c95x0.c            |    1 -
 drivers/pinctrl/pinctrl-da850-pupd.c          |    1 -
 drivers/pinctrl/pinctrl-digicolor.c           |    1 -
 drivers/pinctrl/pinctrl-eic7700.c             |    1 -
 drivers/pinctrl/pinctrl-eyeq5.c               |    1 -
 drivers/pinctrl/pinctrl-ingenic.c             |    1 -
 drivers/pinctrl/pinctrl-loongson2.c           |    1 -
 drivers/pinctrl/pinctrl-lpc18xx.c             |    1 -
 drivers/pinctrl/pinctrl-max77620.c            |    1 -
 drivers/pinctrl/pinctrl-mcp23s08.c            |    1 -
 drivers/pinctrl/pinctrl-mcp23s08_i2c.c        |    1 -
 drivers/pinctrl/pinctrl-mcp23s08_spi.c        |    1 -
 drivers/pinctrl/pinctrl-microchip-sgpio.c     |    1 -
 drivers/pinctrl/pinctrl-mlxbf3.c              |    1 -
 drivers/pinctrl/pinctrl-pistachio.c           |    1 -
 drivers/pinctrl/pinctrl-scmi.c                |    1 -
 drivers/pinctrl/pinctrl-th1520.c              |    1 -
 drivers/pinctrl/pinctrl-tps6594.c             |    1 -
 drivers/pinctrl/qcom/pinctrl-ipq5018.c        |    1 -
 drivers/pinctrl/spear/pinctrl-spear1310.c     |    1 -
 drivers/pinctrl/spear/pinctrl-spear1340.c     |    1 -
 drivers/pinctrl/spear/pinctrl-spear300.c      |    1 -
 drivers/pinctrl/spear/pinctrl-spear310.c      |    1 -
 drivers/pinctrl/spear/pinctrl-spear320.c      |    1 -
 drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c    |    1 -
 .../starfive/pinctrl-starfive-jh7100.c        |    1 -
 .../starfive/pinctrl-starfive-jh7110-aon.c    |    1 -
 .../starfive/pinctrl-starfive-jh7110-sys.c    |    1 -
 .../starfive/pinctrl-starfive-jh7110.c        |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra234.c      |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra238.c      |    1 -
 drivers/pinctrl/tegra/pinctrl-tegra264.c      |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld11.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld20.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld4.c   |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-ld6b.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-nx1.c   |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pro4.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pro5.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pxs2.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-pxs3.c  |    1 -
 .../pinctrl/uniphier/pinctrl-uniphier-sld8.c  |    1 -
 drivers/platform/chrome/cros_ec_chardev.c     |    1 -
 drivers/platform/chrome/cros_ec_debugfs.c     |    1 -
 drivers/platform/chrome/cros_ec_lightbar.c    |    1 -
 drivers/platform/chrome/cros_ec_sensorhub.c   |    1 -
 drivers/platform/chrome/cros_ec_sysfs.c       |    1 -
 drivers/platform/chrome/cros_ec_vbc.c         |    1 -
 .../platform/chrome/cros_kbd_led_backlight.c  |    1 -
 drivers/platform/chrome/cros_usbpd_logger.c   |    1 -
 drivers/platform/chrome/cros_usbpd_notify.c   |    1 -
 drivers/platform/chrome/wilco_ec/core.c       |    1 -
 drivers/platform/chrome/wilco_ec/debugfs.c    |    1 -
 drivers/platform/chrome/wilco_ec/telemetry.c  |    1 -
 drivers/platform/goldfish/goldfish_pipe.c     |    1 -
 drivers/platform/x86/asus-tf103c-dock.c       |    1 -
 drivers/platform/x86/intel/atomisp2/led.c     |    1 -
 drivers/platform/x86/intel/atomisp2/pm.c      |    1 -
 drivers/platform/x86/intel/bxtwc_tmu.c        |    1 -
 drivers/platform/x86/intel/ehl_pse_io.c       |    1 -
 drivers/platform/x86/intel/plr_tpmi.c         |    1 -
 drivers/platform/x86/intel/punit_ipc.c        |    1 -
 drivers/platform/x86/intel_scu_pltdrv.c       |    1 -
 drivers/platform/x86/msi-ec.c                 |    1 +
 .../platform/x86/nvidia-wmi-ec-backlight.c    |    1 -
 drivers/platform/x86/quickstart.c             |    1 -
 drivers/platform/x86/uniwill/uniwill-wmi.c    |    1 -
 .../platform/x86/x86-android-tablets/dmi.c    |    1 -
 .../x86-android-tablets/x86-android-tablets.h |    1 +
 drivers/pmdomain/actions/owl-sps.c            |    1 -
 drivers/pmdomain/imx/imx93-pd.c               |    1 -
 .../marvell/pxa1908-power-controller.c        |    1 -
 drivers/pnp/pnpacpi/core.c                    |    1 -
 drivers/power/reset/brcm-kona-reset.c         |    1 -
 drivers/power/reset/ep93xx-restart.c          |    1 -
 drivers/power/reset/gpio-poweroff.c           |    1 -
 drivers/power/reset/ltc2952-poweroff.c        |    1 -
 drivers/power/reset/macsmc-reboot.c           |    1 -
 drivers/power/reset/ocelot-reset.c            |    1 -
 drivers/power/reset/pwr-mlxbf.c               |    1 -
 drivers/power/reset/qemu-virt-ctrl.c          |    1 -
 drivers/power/reset/sc27xx-poweroff.c         |    1 -
 drivers/power/reset/spacemit-p1-reboot.c      |    1 -
 drivers/power/reset/tdx-ec-poweroff.c         |    1 -
 drivers/power/reset/tps65086-restart.c        |    1 -
 drivers/power/sequencing/pwrseq-pcie-m2.c     |    1 -
 drivers/power/sequencing/pwrseq-qcom-wcn.c    |    1 -
 drivers/power/supply/adp5061.c                |    1 -
 drivers/power/supply/bd71828-power.c          |    1 -
 drivers/power/supply/bd99954-charger.c        |    1 -
 drivers/power/supply/bq24190_charger.c        |    1 -
 drivers/power/supply/chagall-battery.c        |    1 -
 drivers/power/supply/cpcap-charger.c          |    1 -
 drivers/power/supply/cros_charge-control.c    |    1 -
 .../power/supply/cros_peripheral_charger.c    |    1 -
 drivers/power/supply/cros_usbpd-charger.c     |    1 -
 drivers/power/supply/lego_ev3_battery.c       |    1 -
 .../power/supply/max14656_charger_detector.c  |    1 -
 drivers/power/supply/max17042_battery.c       |    1 -
 drivers/power/supply/max77759_charger.c       |    1 -
 drivers/power/supply/max8971_charger.c        |    1 -
 drivers/power/supply/max8998_charger.c        |    1 -
 drivers/power/supply/mp2629_charger.c         |    1 -
 drivers/power/supply/olpc_battery.c           |    1 -
 drivers/power/supply/pm8916_bms_vm.c          |    1 -
 drivers/power/supply/pm8916_lbc.c             |    1 -
 drivers/power/supply/rt5033_charger.c         |    1 -
 drivers/power/supply/rt9467-charger.c         |    1 -
 drivers/power/supply/rt9471.c                 |    1 -
 drivers/power/supply/rt9756.c                 |    1 -
 drivers/power/supply/s2mu005-battery.c        |    1 -
 drivers/power/supply/ug3105_battery.c         |    1 -
 drivers/pps/clients/pps-gpio.c                |    1 -
 drivers/pps/generators/pps_gen_tio.c          |    1 -
 drivers/ptp/ptp_dte.c                         |    1 -
 drivers/pwm/pwm-adp5585.c                     |    1 -
 drivers/pwm/pwm-airoha.c                      |    1 -
 drivers/pwm/pwm-apple.c                       |    1 -
 drivers/pwm/pwm-berlin.c                      |    1 -
 drivers/pwm/pwm-ep93xx.c                      |    1 -
 drivers/pwm/pwm-gpio.c                        |    1 -
 drivers/pwm/pwm-intel-lgm.c                   |    1 -
 drivers/pwm/pwm-keembay.c                     |    1 -
 drivers/pwm/pwm-lpc18xx-sct.c                 |    1 -
 drivers/pwm/pwm-lpss-platform.c               |    1 -
 drivers/pwm/pwm-max7360.c                     |    1 -
 drivers/pwm/pwm-pxa.c                         |    1 -
 drivers/pwm/pwm-sifive.c                      |    1 -
 drivers/pwm/pwm-sl28cpld.c                    |    1 -
 drivers/pwm/pwm-sprd.c                        |    1 -
 drivers/pwm/pwm-sunplus.c                     |    1 -
 drivers/pwm/pwm-vt8500.c                      |    1 -
 drivers/regulator/adp5055-regulator.c         |    1 -
 drivers/regulator/bd71828-regulator.c         |    1 -
 drivers/regulator/max77541-regulator.c        |    1 -
 drivers/regulator/max77675-regulator.c        |    1 -
 drivers/regulator/mt6370-regulator.c          |    1 -
 drivers/regulator/pv88080-regulator.c         |    1 -
 drivers/regulator/rt4803.c                    |    1 -
 drivers/regulator/rt5739.c                    |    1 -
 drivers/regulator/rt6190-regulator.c          |    1 -
 drivers/regulator/rt8092.c                    |    1 -
 drivers/regulator/rtq2208-regulator.c         |    1 -
 drivers/regulator/tps6287x-regulator.c        |    1 -
 drivers/regulator/tps65218-regulator.c        |    1 -
 drivers/regulator/tps65912-regulator.c        |    1 -
 drivers/regulator/vexpress-regulator.c        |    1 -
 drivers/reset/reset-ath79.c                   |    1 -
 drivers/reset/reset-axs10x.c                  |    1 -
 drivers/reset/reset-bcm6345.c                 |    1 -
 drivers/reset/reset-eyeq.c                    |    1 -
 drivers/reset/reset-gpio.c                    |    1 -
 drivers/reset/reset-sunplus.c                 |    1 -
 drivers/reset/reset-tn48m.c                   |    1 -
 .../reset/starfive/reset-starfive-jh7100.c    |    1 -
 drivers/rtc/rtc-88pm886.c                     |    1 -
 drivers/rtc/rtc-cpcap.c                       |    1 -
 drivers/rtc/rtc-cros-ec.c                     |    1 -
 drivers/rtc/rtc-ds1307.c                      |    1 -
 drivers/rtc/rtc-ep93xx.c                      |    1 -
 drivers/rtc/rtc-fsl-ftm-alarm.c               |    1 -
 drivers/rtc/rtc-ftrtc010.c                    |    1 -
 drivers/rtc/rtc-lpc24xx.c                     |    1 -
 drivers/rtc/rtc-m48t86.c                      |    1 -
 drivers/rtc/rtc-mc13xxx.c                     |    1 -
 drivers/rtc/rtc-moxart.c                      |    1 -
 drivers/rtc/rtc-msc313.c                      |    1 -
 drivers/rtc/rtc-mt6397.c                      |    1 -
 drivers/rtc/rtc-mt7622.c                      |    1 -
 drivers/rtc/rtc-mxc_v2.c                      |    1 -
 drivers/rtc/rtc-r7301.c                       |    1 -
 drivers/rtc/rtc-rzn1.c                        |    1 -
 drivers/rtc/rtc-sh.c                          |    1 -
 drivers/rtc/rtc-ssd202d.c                     |    1 -
 drivers/rtc/rtc-tegra.c                       |    1 -
 drivers/rtc/rtc-ti-k3.c                       |    1 -
 drivers/rtc/rtc-tps6594.c                     |    1 -
 drivers/s390/crypto/ap_bus.c                  |    2 +-
 drivers/s390/crypto/vfio_ap_drv.c             |    2 +-
 drivers/s390/crypto/zcrypt_cex4.c             |    2 +-
 drivers/siox/siox-bus-gpio.c                  |    1 -
 drivers/soc/fsl/qe/qe.c                       |    1 -
 drivers/soc/qcom/qcom_pd_mapper.c             |    1 -
 drivers/soc/renesas/rzn1_irqmux.c             |    1 -
 drivers/soc/sophgo/sg2044-topsys.c            |    2 +-
 drivers/soc/tegra/fuse/fuse-tegra.c           |    1 -
 drivers/soc/tegra/fuse/tegra-apbmisc.c        |    1 -
 drivers/soc/ti/smartreflex.c                  |    2 +-
 drivers/soundwire/bus.c                       |    1 -
 drivers/soundwire/bus_type.c                  |    1 -
 drivers/soundwire/cadence_master.c            |    1 -
 drivers/soundwire/debugfs.c                   |    1 -
 .../soundwire/generic_bandwidth_allocation.c  |    1 -
 drivers/soundwire/mipi_disco.c                |    1 -
 drivers/soundwire/stream.c                    |    1 -
 drivers/soundwire/sysfs_slave.c               |    1 -
 drivers/soundwire/sysfs_slave_dpn.c           |    1 -
 drivers/spi/spi-atcspi200.c                   |    1 -
 drivers/spi/spi-cs42l43.c                     |    1 -
 drivers/spi/spi-gpio.c                        |    1 -
 drivers/spi/spi-hisi-sfc-v3xx.c               |    1 -
 drivers/spi/spi-loongson-pci.c                |    1 -
 drivers/spi/spi-loongson-plat.c               |    1 -
 drivers/spi/spi-loopback-test.c               |    1 -
 ...spi-offload-trigger-adi-util-sigma-delta.c |    1 -
 drivers/spi/spi-offload-trigger-pwm.c         |    1 -
 drivers/spi/spi-pxa2xx-platform.c             |    1 -
 drivers/spi/spi-realtek-rtl-snand.c           |    1 -
 drivers/spi/spi-realtek-rtl.c                 |    1 -
 drivers/spi/spi-sc18is602.c                   |    1 -
 drivers/spi/spi-wpcm-fiu.c                    |    1 -
 drivers/spi/spi.c                             |    1 -
 drivers/spi/spidev.c                          |    1 -
 drivers/spmi/spmi-apple-controller.c          |    1 -
 drivers/staging/greybus/arche-apb-ctrl.c      |    1 -
 drivers/thermal/loongson2_thermal.c           |    1 -
 drivers/thermal/renesas/rzg2l_thermal.c       |    1 -
 drivers/tty/goldfish.c                        |    1 -
 drivers/tty/serial/8250/8250_dfl.c            |    1 -
 drivers/tty/serial/8250/8250_dw.c             |    1 -
 drivers/tty/serial/8250/8250_em.c             |    1 -
 drivers/tty/serial/8250/8250_keba.c           |    1 -
 drivers/tty/serial/8250/8250_loongson.c       |    1 -
 drivers/tty/serial/8250/8250_ni.c             |    1 -
 drivers/tty/serial/max3100.c                  |    1 -
 drivers/tty/serial/max310x.c                  |    1 -
 drivers/tty/serial/sc16is7xx.c                |    1 -
 drivers/tty/serial/sc16is7xx_i2c.c            |    1 -
 drivers/tty/serial/sc16is7xx_spi.c            |    1 -
 drivers/tty/serial/sccnxp.c                   |    1 -
 drivers/tty/serial/tegra-utc.c                |    1 -
 drivers/uio/uio_pdrv_genirq.c                 |    1 -
 drivers/usb/dwc2/core.h                       |    1 +
 drivers/usb/gadget/udc/renesas_usbf.c         |    1 -
 drivers/usb/misc/usb-ljca.c                   |    1 -
 drivers/usb/typec/mux/tusb1046.c              |    1 -
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c |    1 -
 .../typec/tcpm/qcom/qcom_pmic_typec_pdphy.c   |    1 -
 .../tcpm/qcom/qcom_pmic_typec_pdphy_stub.c    |    1 -
 .../typec/tcpm/qcom/qcom_pmic_typec_port.c    |    1 -
 drivers/usb/typec/tcpm/tcpci_mt6370.c         |    1 -
 drivers/usb/typec/tcpm/tcpci_rt1711h.c        |    1 -
 drivers/usb/typec/ucsi/cros_ec_ucsi.c         |    1 -
 drivers/vdpa/vdpa.c                           |    1 -
 drivers/vdpa/vdpa_user/vduse_dev.c            |    1 -
 drivers/video/backlight/apple_dwi_bl.c        |    1 -
 drivers/video/backlight/da9052_bl.c           |    1 -
 drivers/video/backlight/hx8357.c              |    1 -
 drivers/video/backlight/ktd2801-backlight.c   |    1 -
 drivers/video/backlight/mp3309c.c             |    1 -
 drivers/video/backlight/mt6370-backlight.c    |    1 -
 drivers/video/backlight/rave-sp-backlight.c   |    1 -
 drivers/video/backlight/rt4831-backlight.c    |    1 -
 .../omap2/omapfb/displays/encoder-opa362.c    |    1 -
 .../omap2/omapfb/displays/encoder-tfp410.c    |    1 -
 .../omap2/omapfb/displays/encoder-tpd12s015.c |    1 -
 .../omap2/omapfb/displays/panel-dsi-cm.c      |    1 -
 .../virt/coco/arm-cca-guest/arm-cca-guest.c   |    2 +-
 drivers/virt/coco/tdx-guest/tdx-guest.c       |    1 -
 drivers/virt/coco/tdx-host/tdx-host.c         |    1 -
 drivers/w1/masters/amd_axi_w1.c               |    1 -
 drivers/w1/masters/ds2490.c                   |    1 -
 drivers/w1/masters/mxc_w1.c                   |    1 -
 drivers/w1/masters/sgi_w1.c                   |    1 -
 drivers/w1/masters/w1-gpio.c                  |    1 -
 drivers/watchdog/at91rm9200_wdt.c             |    1 -
 drivers/watchdog/cros_ec_wdt.c                |    1 -
 drivers/watchdog/davinci_wdt.c                |    1 -
 drivers/watchdog/ftwdt010_wdt.c               |    1 -
 drivers/watchdog/gpio_wdt.c                   |    1 -
 drivers/watchdog/gunyah_wdt.c                 |    1 -
 drivers/watchdog/imgpdc_wdt.c                 |    1 -
 drivers/watchdog/keembay_wdt.c                |    1 -
 drivers/watchdog/max63xx_wdt.c                |    1 -
 drivers/watchdog/max77620_wdt.c               |    1 -
 drivers/watchdog/meson_wdt.c                  |    1 -
 drivers/watchdog/moxart_wdt.c                 |    1 -
 drivers/watchdog/msc313e_wdt.c                |    1 -
 drivers/watchdog/mt7621_wdt.c                 |    1 -
 drivers/watchdog/nic7018_wdt.c                |    1 -
 drivers/watchdog/omap_wdt.c                   |    1 -
 drivers/watchdog/pseries-wdt.c                |    1 -
 drivers/watchdog/realtek_otto_wdt.c           |    1 -
 drivers/watchdog/rt2880_wdt.c                 |    1 -
 drivers/watchdog/rti_wdt.c                    |    1 -
 drivers/watchdog/sbsa_gwdt.c                  |    1 -
 drivers/watchdog/sl28cpld_wdt.c               |    1 -
 drivers/watchdog/sunplus_wdt.c                |    1 -
 drivers/watchdog/ts72xx_wdt.c                 |    1 -
 drivers/watchdog/twl4030_wdt.c                |    1 -
 drivers/watchdog/xilinx_wwdt.c                |    1 -
 include/linux/acpi.h                          |    2 +-
 include/linux/amba/bus.h                      |    2 +-
 include/linux/auxiliary_bus.h                 |    2 +-
 include/linux/bcma/bcma.h                     |    2 +-
 include/linux/cdx/cdx_bus.h                   |    2 +-
 include/linux/device/driver.h                 |    2 +
 include/linux/dfl.h                           |    2 +-
 include/linux/dmi.h                           |    2 +-
 include/linux/eisa.h                          |    2 +-
 include/linux/firewire.h                      |    3 +-
 include/linux/fsl/mc.h                        |    2 +-
 include/linux/hid.h                           |    2 +-
 include/linux/hyperv.h                        |    2 +-
 include/linux/i2c.h                           |    2 +-
 include/linux/i3c/device.h                    |    2 +-
 include/linux/input.h                         |    2 +-
 include/linux/intel-ish-client-if.h           |    2 +-
 include/linux/ipack.h                         |    2 +-
 include/linux/isapnp.h                        |    2 +-
 include/linux/mcb.h                           |    2 +-
 include/linux/mei_cl_bus.h                    |    2 +-
 include/linux/mhi.h                           |    1 +
 include/linux/mmc/sdio_func.h                 |    2 +-
 include/linux/mod_device_id/acpi.h            |   31 +
 include/linux/mod_device_id/amba.h            |   18 +
 include/linux/mod_device_id/ap.h              |   19 +
 include/linux/mod_device_id/apr.h             |   20 +
 include/linux/mod_device_id/auxiliary.h       |   16 +
 include/linux/mod_device_id/bcma.h            |   24 +
 include/linux/mod_device_id/ccw.h             |   26 +
 include/linux/mod_device_id/cdx.h             |   39 +
 include/linux/mod_device_id/coreboot.h        |   19 +
 include/linux/mod_device_id/css.h             |   16 +
 include/linux/mod_device_id/dfl.h             |   33 +
 include/linux/mod_device_id/dmi.h             |   57 +
 include/linux/mod_device_id/eisa.h            |   20 +
 include/linux/mod_device_id/fsl_mc.h          |   21 +
 include/linux/mod_device_id/hda.h             |   16 +
 include/linux/mod_device_id/hid.h             |   21 +
 include/linux/mod_device_id/hv_vmbus.h        |   17 +
 include/linux/mod_device_id/i2c.h             |   18 +
 include/linux/mod_device_id/i3c.h             |   25 +
 include/linux/mod_device_id/ieee1394.h        |   26 +
 include/linux/mod_device_id/input.h           |   61 +
 include/linux/mod_device_id/ipack.h           |   16 +
 include/linux/mod_device_id/isapnp.h          |   15 +
 include/linux/mod_device_id/ishtp.h           |   23 +
 include/linux/mod_device_id/mcb.h             |   14 +
 include/linux/mod_device_id/mdio.h            |   34 +
 include/linux/mod_device_id/mei_cl.h          |   30 +
 include/linux/mod_device_id/mhi.h             |   23 +
 include/linux/mod_device_id/mips_cdmm.h       |   16 +
 include/linux/mod_device_id/of.h              |   14 +
 include/linux/mod_device_id/parisc.h          |   20 +
 include/linux/mod_device_id/pci.h             |   53 +
 include/linux/mod_device_id/pcmcia.h          |   47 +
 include/linux/mod_device_id/platform.h        |   16 +
 include/linux/mod_device_id/pnp.h             |   25 +
 include/linux/mod_device_id/rio.h             |   27 +
 include/linux/mod_device_id/rpmsg.h           |   18 +
 include/linux/mod_device_id/sdio.h            |   20 +
 include/linux/mod_device_id/sdw.h             |   17 +
 include/linux/mod_device_id/serio.h           |   17 +
 include/linux/mod_device_id/slim.h            |   22 +
 include/linux/mod_device_id/spi.h             |   18 +
 include/linux/mod_device_id/spmi.h            |   16 +
 include/linux/mod_device_id/ssam.h            |   27 +
 include/linux/mod_device_id/ssb.h             |   23 +
 include/linux/mod_device_id/tb.h              |   36 +
 include/linux/mod_device_id/tee_client.h      |   17 +
 include/linux/mod_device_id/typec.h           |   25 +
 include/linux/mod_device_id/ulpi.h            |   15 +
 include/linux/mod_device_id/usb.h             |  110 ++
 include/linux/mod_device_id/vchiq.h           |    8 +
 include/linux/mod_device_id/vio.h             |   10 +
 include/linux/mod_device_id/virtio.h          |   15 +
 include/linux/mod_device_id/wmi.h             |   18 +
 include/linux/mod_device_id/x86_cpu.h         |   43 +
 include/linux/mod_device_id/zorro.h           |   18 +
 include/linux/mod_devicetable.h               | 1014 +----------------
 include/linux/of.h                            |    2 +-
 include/linux/of_platform.h                   |    4 +-
 include/linux/pci-epf.h                       |    2 +-
 include/linux/pci.h                           |    2 +-
 include/linux/phy.h                           |    2 +-
 include/linux/platform_data/x86/int3472.h     |    2 +-
 include/linux/platform_data/x86/soc.h         |    2 +-
 include/linux/platform_device.h               |    2 +-
 include/linux/pnp.h                           |    2 +-
 include/linux/raspberrypi/vchiq_bus.h         |    2 +-
 include/linux/rio.h                           |    2 +-
 include/linux/rpmsg.h                         |    2 +-
 include/linux/serio.h                         |    2 +-
 include/linux/slimbus.h                       |    2 +-
 include/linux/soc/qcom/apr.h                  |    2 +-
 include/linux/soundwire/sdw.h                 |    2 +-
 include/linux/spi/spi.h                       |    4 +-
 include/linux/ssb/ssb.h                       |    2 +-
 include/linux/surface_aggregator/device.h     |    2 +-
 include/linux/tee_drv.h                       |    2 +-
 include/linux/thunderbolt.h                   |    2 +-
 include/linux/ulpi/driver.h                   |    2 +-
 include/linux/usb.h                           |    2 +-
 include/linux/usb/serial.h                    |    1 +
 include/linux/usb/typec_altmode.h             |    2 +-
 include/linux/virtio.h                        |    2 +-
 include/linux/wmi.h                           |    2 +-
 include/linux/zorro.h                         |    2 +-
 include/pcmcia/ds.h                           |    2 +-
 include/sound/hda_codec.h                     |    2 +-
 include/sound/hdaudio.h                       |    1 +
 net/qrtr/mhi.c                                |    1 -
 net/rfkill/rfkill-gpio.c                      |    1 -
 sound/atmel/ac97c.c                           |    1 -
 sound/firewire/isight.c                       |    1 -
 .../hda/codecs/side-codecs/cs35l41_hda_i2c.c  |    1 -
 .../hda/codecs/side-codecs/cs35l41_hda_spi.c  |    1 -
 .../hda/codecs/side-codecs/tas2781_hda_i2c.c  |    1 -
 .../hda/codecs/side-codecs/tas2781_hda_spi.c  |    1 -
 sound/hda/core/hda_bus_type.c                 |    2 +-
 sound/soc/atmel/sam9x5_wm8731.c               |    1 -
 sound/soc/codecs/adau1372-i2c.c               |    1 -
 sound/soc/codecs/adau1372-spi.c               |    1 -
 sound/soc/codecs/adau1372.c                   |    1 -
 sound/soc/codecs/adau1761-i2c.c               |    1 -
 sound/soc/codecs/adau1761-spi.c               |    1 -
 sound/soc/codecs/adau1781-i2c.c               |    1 -
 sound/soc/codecs/adau1781-spi.c               |    1 -
 sound/soc/codecs/adau1977-i2c.c               |    1 -
 sound/soc/codecs/adau1977-spi.c               |    1 -
 sound/soc/codecs/adau7118-hw.c                |    1 -
 sound/soc/codecs/ak4104.c                     |    1 -
 sound/soc/codecs/audio-iio-aux.c              |    1 -
 sound/soc/codecs/cs4234.c                     |    1 -
 sound/soc/codecs/cs4270.c                     |    1 -
 sound/soc/codecs/cs42l42-sdw.c                |    1 -
 sound/soc/codecs/cs42l43.c                    |    1 -
 sound/soc/codecs/cs42xx8-i2c.c                |    1 -
 sound/soc/codecs/cs42xx8-spi.c                |    1 -
 sound/soc/codecs/cs4349.c                     |    1 -
 sound/soc/codecs/es8316.c                     |    1 -
 sound/soc/codecs/es8323.c                     |    1 -
 sound/soc/codecs/es9356.c                     |    1 -
 sound/soc/codecs/max98357a.c                  |    1 -
 sound/soc/codecs/max98373-i2c.c               |    1 -
 sound/soc/codecs/max98373-sdw.c               |    1 -
 sound/soc/codecs/max98388.c                   |    1 -
 sound/soc/codecs/mt6351.c                     |    1 -
 sound/soc/codecs/mt6358.c                     |    1 -
 sound/soc/codecs/pcm3168a-i2c.c               |    1 -
 sound/soc/codecs/rt1017-sdca-sdw.c            |    1 -
 sound/soc/codecs/rt1308-sdw.c                 |    1 -
 sound/soc/codecs/rt1316-sdw.c                 |    1 -
 sound/soc/codecs/rt1318-sdw.c                 |    1 -
 sound/soc/codecs/rt1320-sdw.c                 |    1 -
 sound/soc/codecs/rt700-sdw.c                  |    1 -
 sound/soc/codecs/rt711-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt711-sdw.c                  |    1 -
 sound/soc/codecs/rt712-sdca-dmic.c            |    1 -
 sound/soc/codecs/rt712-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt715-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt715-sdw.c                  |    1 -
 sound/soc/codecs/rt721-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt722-sdca-sdw.c             |    1 -
 sound/soc/codecs/rt9123.c                     |    1 -
 sound/soc/codecs/rt9123p.c                    |    1 -
 sound/soc/codecs/rtq9124.c                    |    1 -
 sound/soc/codecs/rtq9128.c                    |    1 -
 sound/soc/codecs/sdw-mockup.c                 |    1 -
 sound/soc/codecs/simple-amplifier.c           |    1 -
 sound/soc/codecs/sma1303.c                    |    1 -
 sound/soc/codecs/src4xxx-i2c.c                |    1 -
 sound/soc/codecs/uda1334.c                    |    1 -
 sound/soc/codecs/wm8510.c                     |    1 -
 sound/soc/codecs/wm8523.c                     |    1 -
 sound/soc/codecs/wm8524.c                     |    1 -
 sound/soc/codecs/wm8580.c                     |    1 -
 sound/soc/codecs/wm8711.c                     |    1 -
 sound/soc/codecs/wm8728.c                     |    1 -
 sound/soc/codecs/wm8731-i2c.c                 |    1 -
 sound/soc/codecs/wm8731-spi.c                 |    1 -
 sound/soc/codecs/wm8737.c                     |    1 -
 sound/soc/codecs/wm8753.c                     |    1 -
 sound/soc/codecs/wm8770.c                     |    1 -
 sound/soc/codecs/wm8776.c                     |    1 -
 sound/soc/fsl/fsl_aud2htx.c                   |    1 -
 sound/soc/fsl/mpc5200_psc_ac97.c              |    1 -
 .../generic/audio-graph-card2-custom-sample.c |    1 -
 sound/soc/jz4740/jz4740-i2s.c                 |    1 -
 sound/soc/mediatek/mt8365/mt8365-mt6357.c     |    1 -
 sound/soc/qcom/apq8096.c                      |    1 -
 sound/soc/qcom/sc7280.c                       |    1 -
 sound/soc/qcom/storm.c                        |    1 -
 sound/soc/rockchip/rockchip_sai.c             |    1 +
 sound/soc/sdca/sdca_class.c                   |    1 -
 sound/soc/sof/sof-client-ipc-flood-test.c     |    1 -
 .../soc/sof/sof-client-ipc-kernel-injector.c  |    1 -
 sound/soc/sof/sof-client-ipc-msg-injector.c   |    1 -
 sound/soc/sunxi/sun50i-codec-analog.c         |    1 -
 sound/soc/sunxi/sun50i-dmic.c                 |    1 -
 sound/soc/tegra/tegra186_asrc.c               |    1 -
 sound/soc/tegra/tegra186_dspk.c               |    1 -
 sound/soc/tegra/tegra20_spdif.c               |    1 -
 sound/soc/tegra/tegra210_adx.c                |    1 -
 sound/soc/tegra/tegra210_amx.c                |    1 -
 sound/soc/tegra/tegra210_dmic.c               |    1 -
 sound/soc/tegra/tegra210_i2s.c                |    1 -
 sound/soc/tegra/tegra210_mixer.c              |    1 -
 sound/soc/tegra/tegra210_mvc.c                |    1 -
 sound/soc/tegra/tegra210_ope.c                |    1 -
 sound/soc/ti/omap-dmic.c                      |    1 -
 sound/soc/ti/omap-mcpdm.c                     |    1 -
 tools/testing/cxl/test/mem.c                  |    1 -
 1633 files changed, 1576 insertions(+), 2527 deletions(-)
 create mode 100644 include/linux/mod_device_id/acpi.h
 create mode 100644 include/linux/mod_device_id/amba.h
 create mode 100644 include/linux/mod_device_id/ap.h
 create mode 100644 include/linux/mod_device_id/apr.h
 create mode 100644 include/linux/mod_device_id/auxiliary.h
 create mode 100644 include/linux/mod_device_id/bcma.h
 create mode 100644 include/linux/mod_device_id/ccw.h
 create mode 100644 include/linux/mod_device_id/cdx.h
 create mode 100644 include/linux/mod_device_id/coreboot.h
 create mode 100644 include/linux/mod_device_id/css.h
 create mode 100644 include/linux/mod_device_id/dfl.h
 create mode 100644 include/linux/mod_device_id/dmi.h
 create mode 100644 include/linux/mod_device_id/eisa.h
 create mode 100644 include/linux/mod_device_id/fsl_mc.h
 create mode 100644 include/linux/mod_device_id/hda.h
 create mode 100644 include/linux/mod_device_id/hid.h
 create mode 100644 include/linux/mod_device_id/hv_vmbus.h
 create mode 100644 include/linux/mod_device_id/i2c.h
 create mode 100644 include/linux/mod_device_id/i3c.h
 create mode 100644 include/linux/mod_device_id/ieee1394.h
 create mode 100644 include/linux/mod_device_id/input.h
 create mode 100644 include/linux/mod_device_id/ipack.h
 create mode 100644 include/linux/mod_device_id/isapnp.h
 create mode 100644 include/linux/mod_device_id/ishtp.h
 create mode 100644 include/linux/mod_device_id/mcb.h
 create mode 100644 include/linux/mod_device_id/mdio.h
 create mode 100644 include/linux/mod_device_id/mei_cl.h
 create mode 100644 include/linux/mod_device_id/mhi.h
 create mode 100644 include/linux/mod_device_id/mips_cdmm.h
 create mode 100644 include/linux/mod_device_id/of.h
 create mode 100644 include/linux/mod_device_id/parisc.h
 create mode 100644 include/linux/mod_device_id/pci.h
 create mode 100644 include/linux/mod_device_id/pcmcia.h
 create mode 100644 include/linux/mod_device_id/platform.h
 create mode 100644 include/linux/mod_device_id/pnp.h
 create mode 100644 include/linux/mod_device_id/rio.h
 create mode 100644 include/linux/mod_device_id/rpmsg.h
 create mode 100644 include/linux/mod_device_id/sdio.h
 create mode 100644 include/linux/mod_device_id/sdw.h
 create mode 100644 include/linux/mod_device_id/serio.h
 create mode 100644 include/linux/mod_device_id/slim.h
 create mode 100644 include/linux/mod_device_id/spi.h
 create mode 100644 include/linux/mod_device_id/spmi.h
 create mode 100644 include/linux/mod_device_id/ssam.h
 create mode 100644 include/linux/mod_device_id/ssb.h
 create mode 100644 include/linux/mod_device_id/tb.h
 create mode 100644 include/linux/mod_device_id/tee_client.h
 create mode 100644 include/linux/mod_device_id/typec.h
 create mode 100644 include/linux/mod_device_id/ulpi.h
 create mode 100644 include/linux/mod_device_id/usb.h
 create mode 100644 include/linux/mod_device_id/vchiq.h
 create mode 100644 include/linux/mod_device_id/vio.h
 create mode 100644 include/linux/mod_device_id/virtio.h
 create mode 100644 include/linux/mod_device_id/wmi.h
 create mode 100644 include/linux/mod_device_id/x86_cpu.h
 create mode 100644 include/linux/mod_device_id/zorro.h

base-commit: ef0c9f75a19532d7675384708fc8621e10850104
-- 
2.47.3


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply	[flat|nested] 26+ messages in thread

* [PATCH v2 01/17] mod_devicetable.h: Split into per subsystem headers
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman, Mark Brown
  Cc: Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	Raag Jadav, Sohil Mehta, Dave Hansen, Rob Herring,
	Saravana Kannan, Bjorn Helgaas, Rafael J. Wysocki, Len Brown,
	Andi Shyti, linux-kernel

<linux/mod_devicetable.h> is included transitively in nearly every
driver in an x86_64 allmodconfig build of v7.1:

	$ find drivers -name \*.o -not -name \*.mod.o | wc -l
	21330
	$ find drivers -name \*.o.cmd -not -name \*.mod.o.cmd | xargs grep -l mod_devicetable.h | wc -l
	17038

The result is that even when touching an obscure device id struct most
of the kernel needs to be recompiled. Given that each driver typically
only needs one or two of these structures, splitting into per subsystem
headers and only including what is really needed reduces the amount of
needed recompilation.

Implement the first step and define each device id struct in a separate
header (together with its associated #defines).

<linux/mod_devicetable.h> is modified to include all the new headers to
continue to provide the same symbols.

Several headers currently include <linux/mod_devicetable.h>, those that
are most lukrative to include only their subsystem headers only are:

	$ git -C source grep -l mod_devicetable.h include/linux | while read h; do echo -n "$h:"; find drivers -name \*.o.cmd -not -name \*.mod.o.cmd | xargs grep -l $h | wc -l; done | sort -t: -k2 -n -r | head
	include/linux/of.h:10897
	include/linux/pci.h:7920
	include/linux/acpi.h:7097
	include/linux/i2c.h:5402
	include/linux/spi/spi.h:1897
	include/linux/dmi.h:1643
	include/linux/usb.h:1222
	include/linux/input.h:1205
	include/linux/mdio.h:835
	include/linux/phy.h:733

struct cpu_feature isn't really a device_id struct. That is kept in
<linux/mod_devicetable.h> for now.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/linux/mod_device_id/acpi.h       |   31 +
 include/linux/mod_device_id/amba.h       |   18 +
 include/linux/mod_device_id/ap.h         |   19 +
 include/linux/mod_device_id/apr.h        |   20 +
 include/linux/mod_device_id/auxiliary.h  |   16 +
 include/linux/mod_device_id/bcma.h       |   24 +
 include/linux/mod_device_id/ccw.h        |   26 +
 include/linux/mod_device_id/cdx.h        |   39 +
 include/linux/mod_device_id/coreboot.h   |   19 +
 include/linux/mod_device_id/css.h        |   16 +
 include/linux/mod_device_id/dfl.h        |   33 +
 include/linux/mod_device_id/dmi.h        |   57 ++
 include/linux/mod_device_id/eisa.h       |   20 +
 include/linux/mod_device_id/fsl_mc.h     |   21 +
 include/linux/mod_device_id/hda.h        |   16 +
 include/linux/mod_device_id/hid.h        |   21 +
 include/linux/mod_device_id/hv_vmbus.h   |   17 +
 include/linux/mod_device_id/i2c.h        |   18 +
 include/linux/mod_device_id/i3c.h        |   25 +
 include/linux/mod_device_id/ieee1394.h   |   26 +
 include/linux/mod_device_id/input.h      |   61 ++
 include/linux/mod_device_id/ipack.h      |   16 +
 include/linux/mod_device_id/isapnp.h     |   15 +
 include/linux/mod_device_id/ishtp.h      |   23 +
 include/linux/mod_device_id/mcb.h        |   14 +
 include/linux/mod_device_id/mdio.h       |   34 +
 include/linux/mod_device_id/mei_cl.h     |   30 +
 include/linux/mod_device_id/mhi.h        |   23 +
 include/linux/mod_device_id/mips_cdmm.h  |   16 +
 include/linux/mod_device_id/of.h         |   14 +
 include/linux/mod_device_id/parisc.h     |   20 +
 include/linux/mod_device_id/pci.h        |   53 ++
 include/linux/mod_device_id/pcmcia.h     |   47 +
 include/linux/mod_device_id/platform.h   |   16 +
 include/linux/mod_device_id/pnp.h        |   25 +
 include/linux/mod_device_id/rio.h        |   27 +
 include/linux/mod_device_id/rpmsg.h      |   18 +
 include/linux/mod_device_id/sdio.h       |   20 +
 include/linux/mod_device_id/sdw.h        |   17 +
 include/linux/mod_device_id/serio.h      |   17 +
 include/linux/mod_device_id/slim.h       |   22 +
 include/linux/mod_device_id/spi.h        |   18 +
 include/linux/mod_device_id/spmi.h       |   16 +
 include/linux/mod_device_id/ssam.h       |   27 +
 include/linux/mod_device_id/ssb.h        |   23 +
 include/linux/mod_device_id/tb.h         |   36 +
 include/linux/mod_device_id/tee_client.h |   17 +
 include/linux/mod_device_id/typec.h      |   25 +
 include/linux/mod_device_id/ulpi.h       |   15 +
 include/linux/mod_device_id/usb.h        |  110 +++
 include/linux/mod_device_id/vchiq.h      |    8 +
 include/linux/mod_device_id/vio.h        |   10 +
 include/linux/mod_device_id/virtio.h     |   15 +
 include/linux/mod_device_id/wmi.h        |   18 +
 include/linux/mod_device_id/x86_cpu.h    |   43 +
 include/linux/mod_device_id/zorro.h      |   18 +
 include/linux/mod_devicetable.h          | 1014 ++--------------------
 57 files changed, 1465 insertions(+), 958 deletions(-)
 create mode 100644 include/linux/mod_device_id/acpi.h
 create mode 100644 include/linux/mod_device_id/amba.h
 create mode 100644 include/linux/mod_device_id/ap.h
 create mode 100644 include/linux/mod_device_id/apr.h
 create mode 100644 include/linux/mod_device_id/auxiliary.h
 create mode 100644 include/linux/mod_device_id/bcma.h
 create mode 100644 include/linux/mod_device_id/ccw.h
 create mode 100644 include/linux/mod_device_id/cdx.h
 create mode 100644 include/linux/mod_device_id/coreboot.h
 create mode 100644 include/linux/mod_device_id/css.h
 create mode 100644 include/linux/mod_device_id/dfl.h
 create mode 100644 include/linux/mod_device_id/dmi.h
 create mode 100644 include/linux/mod_device_id/eisa.h
 create mode 100644 include/linux/mod_device_id/fsl_mc.h
 create mode 100644 include/linux/mod_device_id/hda.h
 create mode 100644 include/linux/mod_device_id/hid.h
 create mode 100644 include/linux/mod_device_id/hv_vmbus.h
 create mode 100644 include/linux/mod_device_id/i2c.h
 create mode 100644 include/linux/mod_device_id/i3c.h
 create mode 100644 include/linux/mod_device_id/ieee1394.h
 create mode 100644 include/linux/mod_device_id/input.h
 create mode 100644 include/linux/mod_device_id/ipack.h
 create mode 100644 include/linux/mod_device_id/isapnp.h
 create mode 100644 include/linux/mod_device_id/ishtp.h
 create mode 100644 include/linux/mod_device_id/mcb.h
 create mode 100644 include/linux/mod_device_id/mdio.h
 create mode 100644 include/linux/mod_device_id/mei_cl.h
 create mode 100644 include/linux/mod_device_id/mhi.h
 create mode 100644 include/linux/mod_device_id/mips_cdmm.h
 create mode 100644 include/linux/mod_device_id/of.h
 create mode 100644 include/linux/mod_device_id/parisc.h
 create mode 100644 include/linux/mod_device_id/pci.h
 create mode 100644 include/linux/mod_device_id/pcmcia.h
 create mode 100644 include/linux/mod_device_id/platform.h
 create mode 100644 include/linux/mod_device_id/pnp.h
 create mode 100644 include/linux/mod_device_id/rio.h
 create mode 100644 include/linux/mod_device_id/rpmsg.h
 create mode 100644 include/linux/mod_device_id/sdio.h
 create mode 100644 include/linux/mod_device_id/sdw.h
 create mode 100644 include/linux/mod_device_id/serio.h
 create mode 100644 include/linux/mod_device_id/slim.h
 create mode 100644 include/linux/mod_device_id/spi.h
 create mode 100644 include/linux/mod_device_id/spmi.h
 create mode 100644 include/linux/mod_device_id/ssam.h
 create mode 100644 include/linux/mod_device_id/ssb.h
 create mode 100644 include/linux/mod_device_id/tb.h
 create mode 100644 include/linux/mod_device_id/tee_client.h
 create mode 100644 include/linux/mod_device_id/typec.h
 create mode 100644 include/linux/mod_device_id/ulpi.h
 create mode 100644 include/linux/mod_device_id/usb.h
 create mode 100644 include/linux/mod_device_id/vchiq.h
 create mode 100644 include/linux/mod_device_id/vio.h
 create mode 100644 include/linux/mod_device_id/virtio.h
 create mode 100644 include/linux/mod_device_id/wmi.h
 create mode 100644 include/linux/mod_device_id/x86_cpu.h
 create mode 100644 include/linux/mod_device_id/zorro.h

diff --git a/include/linux/mod_device_id/acpi.h b/include/linux/mod_device_id/acpi.h
new file mode 100644
index 000000000000..94690096f792
--- /dev/null
+++ b/include/linux/mod_device_id/acpi.h
@@ -0,0 +1,31 @@
+#ifndef LINUX_MOD_DEVICE_ID_ACPI_H
+#define LINUX_MOD_DEVICE_ID_ACPI_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define ACPI_ID_LEN	16
+
+struct acpi_device_id {
+	__u8 id[ACPI_ID_LEN];
+	kernel_ulong_t driver_data;
+	__u32 cls;
+	__u32 cls_msk;
+};
+
+/**
+ * ACPI_DEVICE_CLASS - macro used to describe an ACPI device with
+ * the PCI-defined class-code information
+ *
+ * @_cls : the class, subclass, prog-if triple for this device
+ * @_msk : the class mask for this device
+ *
+ * This macro is used to create a struct acpi_device_id that matches a
+ * specific PCI class. The .id and .driver_data fields will be left
+ * initialized with the default value.
+ */
+#define ACPI_DEVICE_CLASS(_cls, _msk)	.cls = (_cls), .cls_msk = (_msk),
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_ACPI_H */
diff --git a/include/linux/mod_device_id/amba.h b/include/linux/mod_device_id/amba.h
new file mode 100644
index 000000000000..ff9406f065dc
--- /dev/null
+++ b/include/linux/mod_device_id/amba.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_MOD_DEVICE_ID_AMBA_H
+#define LINUX_MOD_DEVICE_ID_AMBA_H
+
+/**
+ * struct amba_id - identifies a device on an AMBA bus
+ * @id: The significant bits if the hardware device ID
+ * @mask: Bitmask specifying which bits of the id field are significant when
+ *	matching.  A driver binds to a device when ((hardware device ID) & mask)
+ *	== id.
+ * @data: Private data used by the driver.
+ */
+struct amba_id {
+	unsigned int		id;
+	unsigned int		mask;
+	void			*data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_AMBA_H */
diff --git a/include/linux/mod_device_id/ap.h b/include/linux/mod_device_id/ap.h
new file mode 100644
index 000000000000..cc7b40661f18
--- /dev/null
+++ b/include/linux/mod_device_id/ap.h
@@ -0,0 +1,19 @@
+#ifndef LINUX_MOD_DEVICE_ID_AP_H
+#define LINUX_MOD_DEVICE_ID_AP_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define AP_DEVICE_ID_MATCH_CARD_TYPE		0x01
+#define AP_DEVICE_ID_MATCH_QUEUE_TYPE		0x02
+
+/* s390 AP bus devices */
+struct ap_device_id {
+	__u16 match_flags;	/* which fields to match against */
+	__u8 dev_type;		/* device type */
+	kernel_ulong_t driver_info;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_AP_H */
diff --git a/include/linux/mod_device_id/apr.h b/include/linux/mod_device_id/apr.h
new file mode 100644
index 000000000000..50ff3266617c
--- /dev/null
+++ b/include/linux/mod_device_id/apr.h
@@ -0,0 +1,20 @@
+#ifndef LINUX_MOD_DEVICE_ID_APR_H
+#define LINUX_MOD_DEVICE_ID_APR_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define APR_NAME_SIZE	32
+#define APR_MODULE_PREFIX "apr:"
+
+struct apr_device_id {
+	char name[APR_NAME_SIZE];
+	__u32 domain_id;
+	__u32 svc_id;
+	__u32 svc_version;
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_APR_H */
diff --git a/include/linux/mod_device_id/auxiliary.h b/include/linux/mod_device_id/auxiliary.h
new file mode 100644
index 000000000000..d542d2ff53e3
--- /dev/null
+++ b/include/linux/mod_device_id/auxiliary.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_AUXILIARY_H
+#define LINUX_MOD_DEVICE_ID_AUXILIARY_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define AUXILIARY_NAME_SIZE 40
+#define AUXILIARY_MODULE_PREFIX "auxiliary:"
+
+struct auxiliary_device_id {
+	char name[AUXILIARY_NAME_SIZE];
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_AUXILIARY_H */
diff --git a/include/linux/mod_device_id/bcma.h b/include/linux/mod_device_id/bcma.h
new file mode 100644
index 000000000000..3193c7faa0d6
--- /dev/null
+++ b/include/linux/mod_device_id/bcma.h
@@ -0,0 +1,24 @@
+#ifndef LINUX_MOD_DEVICE_ID_BCMA_H
+#define LINUX_MOD_DEVICE_ID_BCMA_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define BCMA_CORE(_manuf, _id, _rev, _class)  \
+	{ .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, }
+
+#define BCMA_ANY_MANUF		0xFFFF
+#define BCMA_ANY_ID		0xFFFF
+#define BCMA_ANY_REV		0xFF
+#define BCMA_ANY_CLASS		0xFF
+
+/* Broadcom's specific AMBA core, see drivers/bcma/ */
+struct bcma_device_id {
+	__u16	manuf;
+	__u16	id;
+	__u8	rev;
+	__u8	class;
+} __attribute__((packed,aligned(2)));
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_BCMA_H */
diff --git a/include/linux/mod_device_id/ccw.h b/include/linux/mod_device_id/ccw.h
new file mode 100644
index 000000000000..224b2eb33770
--- /dev/null
+++ b/include/linux/mod_device_id/ccw.h
@@ -0,0 +1,26 @@
+#ifndef LINUX_MOD_DEVICE_ID_CCW_H
+#define LINUX_MOD_DEVICE_ID_CCW_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define CCW_DEVICE_ID_MATCH_CU_TYPE		0x01
+#define CCW_DEVICE_ID_MATCH_CU_MODEL		0x02
+#define CCW_DEVICE_ID_MATCH_DEVICE_TYPE		0x04
+#define CCW_DEVICE_ID_MATCH_DEVICE_MODEL	0x08
+
+/* s390 CCW devices */
+struct ccw_device_id {
+	__u16	match_flags;	/* which fields to match against */
+
+	__u16	cu_type;	/* control unit type     */
+	__u16	dev_type;	/* device type           */
+	__u8	cu_model;	/* control unit model    */
+	__u8	dev_model;	/* device model          */
+
+	kernel_ulong_t driver_info;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_CCW_H */
diff --git a/include/linux/mod_device_id/cdx.h b/include/linux/mod_device_id/cdx.h
new file mode 100644
index 000000000000..5c1bd314b132
--- /dev/null
+++ b/include/linux/mod_device_id/cdx.h
@@ -0,0 +1,39 @@
+#ifndef LINUX_MOD_DEVICE_ID_CDX_H
+#define LINUX_MOD_DEVICE_ID_CDX_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define CDX_ANY_ID (0xFFFF)
+
+enum {
+	CDX_ID_F_VFIO_DRIVER_OVERRIDE = 1,
+};
+
+/**
+ * struct cdx_device_id - CDX device identifier
+ * @vendor: Vendor ID
+ * @device: Device ID
+ * @subvendor: Subsystem vendor ID (or CDX_ANY_ID)
+ * @subdevice: Subsystem device ID (or CDX_ANY_ID)
+ * @class: Device class
+ *         Most drivers do not need to specify class/class_mask
+ *         as vendor/device is normally sufficient.
+ * @class_mask: Limit which sub-fields of the class field are compared.
+ * @override_only: Match only when dev->driver_override is this driver.
+ *
+ * Type of entries in the "device Id" table for CDX devices supported by
+ * a CDX device driver.
+ */
+struct cdx_device_id {
+	__u16 vendor;
+	__u16 device;
+	__u16 subvendor;
+	__u16 subdevice;
+	__u32 class;
+	__u32 class_mask;
+	__u32 override_only;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_CDX_H */
diff --git a/include/linux/mod_device_id/coreboot.h b/include/linux/mod_device_id/coreboot.h
new file mode 100644
index 000000000000..a66cce91785e
--- /dev/null
+++ b/include/linux/mod_device_id/coreboot.h
@@ -0,0 +1,19 @@
+#ifndef LINUX_MOD_DEVICE_ID_COREBOOT_H
+#define LINUX_MOD_DEVICE_ID_COREBOOT_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/**
+ * struct coreboot_device_id - Identifies a coreboot table entry
+ * @tag: tag ID
+ * @driver_data: driver specific data
+ */
+struct coreboot_device_id {
+	__u32 tag;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_COREBOOT_H */
diff --git a/include/linux/mod_device_id/css.h b/include/linux/mod_device_id/css.h
new file mode 100644
index 000000000000..0e42700cd237
--- /dev/null
+++ b/include/linux/mod_device_id/css.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_CSS_H
+#define LINUX_MOD_DEVICE_ID_CSS_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* s390 css bus devices (subchannels) */
+struct css_device_id {
+	__u8 match_flags;
+	__u8 type; /* subchannel type */
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_CSS_H */
diff --git a/include/linux/mod_device_id/dfl.h b/include/linux/mod_device_id/dfl.h
new file mode 100644
index 000000000000..46398b0cbab6
--- /dev/null
+++ b/include/linux/mod_device_id/dfl.h
@@ -0,0 +1,33 @@
+#ifndef LINUX_MOD_DEVICE_ID_DFL_H
+#define LINUX_MOD_DEVICE_ID_DFL_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/*
+ * DFL (Device Feature List)
+ *
+ * DFL defines a linked list of feature headers within the device MMIO space to
+ * provide an extensible way of adding features. Software can walk through these
+ * predefined data structures to enumerate features. It is now used in the FPGA.
+ * See Documentation/fpga/dfl.rst for more information.
+ *
+ * The dfl bus type is introduced to match the individual feature devices (dfl
+ * devices) for specific dfl drivers.
+ */
+
+/**
+ * struct dfl_device_id -  dfl device identifier
+ * @type: DFL FIU type of the device. See enum dfl_id_type.
+ * @feature_id: feature identifier local to its DFL FIU type.
+ * @driver_data: driver specific data.
+ */
+struct dfl_device_id {
+	__u16 type;
+	__u16 feature_id;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_DFL_H */
diff --git a/include/linux/mod_device_id/dmi.h b/include/linux/mod_device_id/dmi.h
new file mode 100644
index 000000000000..925c2d2e156d
--- /dev/null
+++ b/include/linux/mod_device_id/dmi.h
@@ -0,0 +1,57 @@
+#ifndef LINUX_MOD_DEVICE_ID_DMI_H
+#define LINUX_MOD_DEVICE_ID_DMI_H
+
+#define DMI_MATCH(a, b)	{ .slot = a, .substr = b }
+#define DMI_EXACT_MATCH(a, b)	{ .slot = a, .substr = b, .exact_match = 1 }
+
+/* dmi */
+enum dmi_field {
+	DMI_NONE,
+	DMI_BIOS_VENDOR,
+	DMI_BIOS_VERSION,
+	DMI_BIOS_DATE,
+	DMI_BIOS_RELEASE,
+	DMI_EC_FIRMWARE_RELEASE,
+	DMI_SYS_VENDOR,
+	DMI_PRODUCT_NAME,
+	DMI_PRODUCT_VERSION,
+	DMI_PRODUCT_SERIAL,
+	DMI_PRODUCT_UUID,
+	DMI_PRODUCT_SKU,
+	DMI_PRODUCT_FAMILY,
+	DMI_BOARD_VENDOR,
+	DMI_BOARD_NAME,
+	DMI_BOARD_VERSION,
+	DMI_BOARD_SERIAL,
+	DMI_BOARD_ASSET_TAG,
+	DMI_CHASSIS_VENDOR,
+	DMI_CHASSIS_TYPE,
+	DMI_CHASSIS_VERSION,
+	DMI_CHASSIS_SERIAL,
+	DMI_CHASSIS_ASSET_TAG,
+	DMI_STRING_MAX,
+	DMI_OEM_STRING,	/* special case - will not be in dmi_ident */
+};
+
+struct dmi_strmatch {
+	unsigned char slot:7;
+	unsigned char exact_match:1;
+	char substr[79];
+};
+
+struct dmi_system_id {
+	int (*callback)(const struct dmi_system_id *);
+	const char *ident;
+	struct dmi_strmatch matches[4];
+	void *driver_data;
+};
+
+/*
+ * struct dmi_device_id appears during expansion of
+ * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
+ * but this is enough for gcc 3.4.6 to error out:
+ *	error: storage size of '__mod_dmi_device_table' isn't known
+ */
+#define dmi_device_id dmi_system_id
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_DMI_H */
diff --git a/include/linux/mod_device_id/eisa.h b/include/linux/mod_device_id/eisa.h
new file mode 100644
index 000000000000..ca1b49561e7b
--- /dev/null
+++ b/include/linux/mod_device_id/eisa.h
@@ -0,0 +1,20 @@
+#ifndef LINUX_MOD_DEVICE_ID_EISA_H
+#define LINUX_MOD_DEVICE_ID_EISA_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* EISA */
+
+#define EISA_SIG_LEN   8
+
+/* The EISA signature, in ASCII form, null terminated */
+struct eisa_device_id {
+	char          sig[EISA_SIG_LEN];
+	kernel_ulong_t driver_data;
+};
+
+#define EISA_DEVICE_MODALIAS_FMT "eisa:s%s"
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_EISA_H */
diff --git a/include/linux/mod_device_id/fsl_mc.h b/include/linux/mod_device_id/fsl_mc.h
new file mode 100644
index 000000000000..37f2ef3e931f
--- /dev/null
+++ b/include/linux/mod_device_id/fsl_mc.h
@@ -0,0 +1,21 @@
+#ifndef LINUX_MOD_DEVICE_ID_FSL_MC_H
+#define LINUX_MOD_DEVICE_ID_FSL_MC_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+/**
+ * struct fsl_mc_device_id - MC object device identifier
+ * @vendor: vendor ID
+ * @obj_type: MC object type
+ *
+ * Type of entries in the "device Id" table for MC object devices supported by
+ * a MC object device driver. The last entry of the table has vendor set to 0x0
+ */
+struct fsl_mc_device_id {
+	__u16 vendor;
+	const char obj_type[16];
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_FSL_MC_H */
diff --git a/include/linux/mod_device_id/hda.h b/include/linux/mod_device_id/hda.h
new file mode 100644
index 000000000000..507ef349c690
--- /dev/null
+++ b/include/linux/mod_device_id/hda.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_HDA_H
+#define LINUX_MOD_DEVICE_ID_HDA_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+struct hda_device_id {
+	__u32 vendor_id;
+	__u32 rev_id;
+	__u8 api_version;
+	const char *name;
+	unsigned long driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_HDA_H */
diff --git a/include/linux/mod_device_id/hid.h b/include/linux/mod_device_id/hid.h
new file mode 100644
index 000000000000..6b1790672bd2
--- /dev/null
+++ b/include/linux/mod_device_id/hid.h
@@ -0,0 +1,21 @@
+#ifndef LINUX_MOD_DEVICE_ID_HID_H
+#define LINUX_MOD_DEVICE_ID_HID_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define HID_ANY_ID				(~0)
+#define HID_BUS_ANY				0xffff
+#define HID_GROUP_ANY				0x0000
+
+struct hid_device_id {
+	__u16 bus;
+	__u16 group;
+	__u32 vendor;
+	__u32 product;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_HID_H */
diff --git a/include/linux/mod_device_id/hv_vmbus.h b/include/linux/mod_device_id/hv_vmbus.h
new file mode 100644
index 000000000000..1b949082a191
--- /dev/null
+++ b/include/linux/mod_device_id/hv_vmbus.h
@@ -0,0 +1,17 @@
+#ifndef LINUX_MOD_DEVICE_ID_HV_VMBUS_H
+#define LINUX_MOD_DEVICE_ID_HV_VMBUS_H
+
+#ifdef __KERNEL__
+#include <linux/uuid.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/*
+ * For Hyper-V devices we use the device guid as the id.
+ */
+struct hv_vmbus_device_id {
+	guid_t guid;
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_HV_VMBUS_H */
diff --git a/include/linux/mod_device_id/i2c.h b/include/linux/mod_device_id/i2c.h
new file mode 100644
index 000000000000..7a5f1906df77
--- /dev/null
+++ b/include/linux/mod_device_id/i2c.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_MOD_DEVICE_ID_I2C_H
+#define LINUX_MOD_DEVICE_ID_I2C_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* i2c */
+
+#define I2C_NAME_SIZE	20
+#define I2C_MODULE_PREFIX "i2c:"
+
+struct i2c_device_id {
+	char name[I2C_NAME_SIZE];
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_I2C_H */
diff --git a/include/linux/mod_device_id/i3c.h b/include/linux/mod_device_id/i3c.h
new file mode 100644
index 000000000000..d731891887d5
--- /dev/null
+++ b/include/linux/mod_device_id/i3c.h
@@ -0,0 +1,25 @@
+#ifndef LINUX_MOD_DEVICE_ID_I3C_H
+#define LINUX_MOD_DEVICE_ID_I3C_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+/* i3c */
+
+#define I3C_MATCH_DCR			0x1
+#define I3C_MATCH_MANUF			0x2
+#define I3C_MATCH_PART			0x4
+#define I3C_MATCH_EXTRA_INFO		0x8
+
+struct i3c_device_id {
+	__u8 match_flags;
+	__u8 dcr;
+	__u16 manuf_id;
+	__u16 part_id;
+	__u16 extra_info;
+
+	const void *data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_I3C_H */
diff --git a/include/linux/mod_device_id/ieee1394.h b/include/linux/mod_device_id/ieee1394.h
new file mode 100644
index 000000000000..5b78462babf5
--- /dev/null
+++ b/include/linux/mod_device_id/ieee1394.h
@@ -0,0 +1,26 @@
+#ifndef LINUX_MOD_DEVICE_ID_IEEE1394_H
+#define LINUX_MOD_DEVICE_ID_IEEE1394_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define IEEE1394_MATCH_VENDOR_ID	0x0001
+#define IEEE1394_MATCH_MODEL_ID		0x0002
+#define IEEE1394_MATCH_SPECIFIER_ID	0x0004
+#define IEEE1394_MATCH_VERSION		0x0008
+
+struct ieee1394_device_id {
+	__u32 match_flags;
+	__u32 vendor_id;
+	__u32 model_id;
+	__u32 specifier_id;
+	__u32 version;
+	union {
+		kernel_ulong_t driver_data;
+		const void *driver_data_ptr;
+	};
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_IEEE1394_H */
diff --git a/include/linux/mod_device_id/input.h b/include/linux/mod_device_id/input.h
new file mode 100644
index 000000000000..67465c3c2d79
--- /dev/null
+++ b/include/linux/mod_device_id/input.h
@@ -0,0 +1,61 @@
+#ifndef LINUX_MOD_DEVICE_ID_INPUT_H
+#define LINUX_MOD_DEVICE_ID_INPUT_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* Input */
+#define INPUT_DEVICE_ID_EV_MAX		0x1f
+#define INPUT_DEVICE_ID_KEY_MIN_INTERESTING	0x71
+#define INPUT_DEVICE_ID_KEY_MAX		0x2ff
+#define INPUT_DEVICE_ID_REL_MAX		0x0f
+#define INPUT_DEVICE_ID_ABS_MAX		0x3f
+#define INPUT_DEVICE_ID_MSC_MAX		0x07
+#define INPUT_DEVICE_ID_LED_MAX		0x0f
+#define INPUT_DEVICE_ID_SND_MAX		0x07
+#define INPUT_DEVICE_ID_FF_MAX		0x7f
+#define INPUT_DEVICE_ID_SW_MAX		0x11
+#define INPUT_DEVICE_ID_PROP_MAX	0x1f
+
+#define INPUT_DEVICE_ID_MATCH_BUS	1
+#define INPUT_DEVICE_ID_MATCH_VENDOR	2
+#define INPUT_DEVICE_ID_MATCH_PRODUCT	4
+#define INPUT_DEVICE_ID_MATCH_VERSION	8
+
+#define INPUT_DEVICE_ID_MATCH_EVBIT	0x0010
+#define INPUT_DEVICE_ID_MATCH_KEYBIT	0x0020
+#define INPUT_DEVICE_ID_MATCH_RELBIT	0x0040
+#define INPUT_DEVICE_ID_MATCH_ABSBIT	0x0080
+#define INPUT_DEVICE_ID_MATCH_MSCIT	0x0100
+#define INPUT_DEVICE_ID_MATCH_LEDBIT	0x0200
+#define INPUT_DEVICE_ID_MATCH_SNDBIT	0x0400
+#define INPUT_DEVICE_ID_MATCH_FFBIT	0x0800
+#define INPUT_DEVICE_ID_MATCH_SWBIT	0x1000
+#define INPUT_DEVICE_ID_MATCH_PROPBIT	0x2000
+
+struct input_device_id {
+
+	kernel_ulong_t flags;
+
+	__u16 bustype;
+	__u16 vendor;
+	__u16 product;
+	__u16 version;
+
+	kernel_ulong_t evbit[INPUT_DEVICE_ID_EV_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t keybit[INPUT_DEVICE_ID_KEY_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t relbit[INPUT_DEVICE_ID_REL_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t absbit[INPUT_DEVICE_ID_ABS_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t mscbit[INPUT_DEVICE_ID_MSC_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t ledbit[INPUT_DEVICE_ID_LED_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t sndbit[INPUT_DEVICE_ID_SND_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t ffbit[INPUT_DEVICE_ID_FF_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t swbit[INPUT_DEVICE_ID_SW_MAX / BITS_PER_LONG + 1];
+	kernel_ulong_t propbit[INPUT_DEVICE_ID_PROP_MAX / BITS_PER_LONG + 1];
+
+	kernel_ulong_t driver_info;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_INPUT_H */
diff --git a/include/linux/mod_device_id/ipack.h b/include/linux/mod_device_id/ipack.h
new file mode 100644
index 000000000000..6ec017cf11e0
--- /dev/null
+++ b/include/linux/mod_device_id/ipack.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_IPACK_H
+#define LINUX_MOD_DEVICE_ID_IPACK_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define IPACK_ANY_FORMAT 0xff
+#define IPACK_ANY_ID (~0)
+struct ipack_device_id {
+	__u8  format;			/* Format version or IPACK_ANY_ID */
+	__u32 vendor;			/* Vendor ID or IPACK_ANY_ID */
+	__u32 device;			/* Device ID or IPACK_ANY_ID */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_IPACK_H */
diff --git a/include/linux/mod_device_id/isapnp.h b/include/linux/mod_device_id/isapnp.h
new file mode 100644
index 000000000000..3243b4b61ee7
--- /dev/null
+++ b/include/linux/mod_device_id/isapnp.h
@@ -0,0 +1,15 @@
+#ifndef LINUX_MOD_DEVICE_ID_ISAPNP_H
+#define LINUX_MOD_DEVICE_ID_ISAPNP_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define ISAPNP_ANY_ID		0xffff
+struct isapnp_device_id {
+	unsigned short card_vendor, card_device;
+	unsigned short vendor, function;
+	kernel_ulong_t driver_data;	/* data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_ISAPNP_H */
diff --git a/include/linux/mod_device_id/ishtp.h b/include/linux/mod_device_id/ishtp.h
new file mode 100644
index 000000000000..d9d37b686b9c
--- /dev/null
+++ b/include/linux/mod_device_id/ishtp.h
@@ -0,0 +1,23 @@
+#ifndef LINUX_MOD_DEVICE_ID_ISHTP_H
+#define LINUX_MOD_DEVICE_ID_ISHTP_H
+
+#ifdef __KERNEL__
+#include <linux/uuid.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* ISHTP (Integrated Sensor Hub Transport Protocol) */
+
+#define ISHTP_MODULE_PREFIX	"ishtp:"
+
+/**
+ * struct ishtp_device_id - ISHTP device identifier
+ * @guid: GUID of the device.
+ * @driver_data: pointer to driver specific data
+ */
+struct ishtp_device_id {
+	guid_t guid;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_ISHTP_H */
diff --git a/include/linux/mod_device_id/mcb.h b/include/linux/mod_device_id/mcb.h
new file mode 100644
index 000000000000..0ee4ca1f180a
--- /dev/null
+++ b/include/linux/mod_device_id/mcb.h
@@ -0,0 +1,14 @@
+#ifndef LINUX_MOD_DEVICE_ID_MCB_H
+#define LINUX_MOD_DEVICE_ID_MCB_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+struct mcb_device_id {
+	__u16 device;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_MCB_H */
diff --git a/include/linux/mod_device_id/mdio.h b/include/linux/mod_device_id/mdio.h
new file mode 100644
index 000000000000..21af3598430c
--- /dev/null
+++ b/include/linux/mod_device_id/mdio.h
@@ -0,0 +1,34 @@
+#ifndef LINUX_MOD_DEVICE_ID_MDIO_H
+#define LINUX_MOD_DEVICE_ID_MDIO_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define MDIO_MODULE_PREFIX	"mdio:"
+
+#define MDIO_ID_FMT "%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u"
+#define MDIO_ID_ARGS(_id) \
+	((_id)>>31) & 1, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \
+	((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \
+	((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \
+	((_id)>>19) & 1, ((_id)>>18) & 1, ((_id)>>17) & 1, ((_id)>>16) & 1, \
+	((_id)>>15) & 1, ((_id)>>14) & 1, ((_id)>>13) & 1, ((_id)>>12) & 1, \
+	((_id)>>11) & 1, ((_id)>>10) & 1, ((_id)>>9) & 1, ((_id)>>8) & 1, \
+	((_id)>>7) & 1, ((_id)>>6) & 1, ((_id)>>5) & 1, ((_id)>>4) & 1, \
+	((_id)>>3) & 1, ((_id)>>2) & 1, ((_id)>>1) & 1, (_id) & 1
+
+/**
+ * struct mdio_device_id - identifies PHY devices on an MDIO/MII bus
+ * @phy_id: The result of
+ *     (mdio_read(&MII_PHYSID1) << 16 | mdio_read(&MII_PHYSID2)) & @phy_id_mask
+ *     for this PHY type
+ * @phy_id_mask: Defines the significant bits of @phy_id.  A value of 0
+ *     is used to terminate an array of struct mdio_device_id.
+ */
+struct mdio_device_id {
+	__u32 phy_id;
+	__u32 phy_id_mask;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_MDIO_H */
diff --git a/include/linux/mod_device_id/mei_cl.h b/include/linux/mod_device_id/mei_cl.h
new file mode 100644
index 000000000000..1d940603b8c6
--- /dev/null
+++ b/include/linux/mod_device_id/mei_cl.h
@@ -0,0 +1,30 @@
+#ifndef LINUX_MOD_DEVICE_ID_MEI_CL_H
+#define LINUX_MOD_DEVICE_ID_MEI_CL_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/mei_uuid.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define MEI_CL_MODULE_PREFIX "mei:"
+#define MEI_CL_NAME_SIZE 32
+#define MEI_CL_VERSION_ANY 0xff
+
+/**
+ * struct mei_cl_device_id - MEI client device identifier
+ * @name: helper name
+ * @uuid: client uuid
+ * @version: client protocol version
+ * @driver_info: information used by the driver.
+ *
+ * identifies mei client device by uuid and name
+ */
+struct mei_cl_device_id {
+	char name[MEI_CL_NAME_SIZE];
+	uuid_le uuid;
+	__u8 version;
+	kernel_ulong_t driver_info;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_MEI_CL_H */
diff --git a/include/linux/mod_device_id/mhi.h b/include/linux/mod_device_id/mhi.h
new file mode 100644
index 000000000000..4193c76f4657
--- /dev/null
+++ b/include/linux/mod_device_id/mhi.h
@@ -0,0 +1,23 @@
+#ifndef LINUX_MOD_DEVICE_ID_MHI_H
+#define LINUX_MOD_DEVICE_ID_MHI_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define MHI_DEVICE_MODALIAS_FMT "mhi:%s"
+#define MHI_NAME_SIZE 32
+
+#define MHI_EP_DEVICE_MODALIAS_FMT "mhi_ep:%s"
+
+/**
+ * struct mhi_device_id - MHI device identification
+ * @chan: MHI channel name
+ * @driver_data: driver data;
+ */
+struct mhi_device_id {
+	const char chan[MHI_NAME_SIZE];
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_MHI_H */
diff --git a/include/linux/mod_device_id/mips_cdmm.h b/include/linux/mod_device_id/mips_cdmm.h
new file mode 100644
index 000000000000..10c7d131d92b
--- /dev/null
+++ b/include/linux/mod_device_id/mips_cdmm.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_MIPS_CDMM_H
+#define LINUX_MOD_DEVICE_ID_MIPS_CDMM_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+/**
+ * struct mips_cdmm_device_id - identifies devices in MIPS CDMM bus
+ * @type:	Device type identifier.
+ */
+struct mips_cdmm_device_id {
+	__u8	type;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_MIPS_CDMM_H */
diff --git a/include/linux/mod_device_id/of.h b/include/linux/mod_device_id/of.h
new file mode 100644
index 000000000000..f2b588c94e8a
--- /dev/null
+++ b/include/linux/mod_device_id/of.h
@@ -0,0 +1,14 @@
+#ifndef LINUX_MOD_DEVICE_ID_OF_H
+#define LINUX_MOD_DEVICE_ID_OF_H
+
+/*
+ * Struct used for matching a device
+ */
+struct of_device_id {
+	char name[32];
+	char type[32];
+	char compatible[128];
+	const void *data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_OF_H */
diff --git a/include/linux/mod_device_id/parisc.h b/include/linux/mod_device_id/parisc.h
new file mode 100644
index 000000000000..3f5df8a038d8
--- /dev/null
+++ b/include/linux/mod_device_id/parisc.h
@@ -0,0 +1,20 @@
+#ifndef LINUX_MOD_DEVICE_ID_PARISC_H
+#define LINUX_MOD_DEVICE_ID_PARISC_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define PA_HWTYPE_ANY_ID	0xff
+#define PA_HVERSION_REV_ANY_ID	0xff
+#define PA_HVERSION_ANY_ID	0xffff
+#define PA_SVERSION_ANY_ID	0xffffffff
+
+struct parisc_device_id {
+	__u8	hw_type;	/* 5 bits used */
+	__u8	hversion_rev;	/* 4 bits */
+	__u16	hversion;	/* 12 bits */
+	__u32	sversion;	/* 20 bits */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_PARISC_H */
diff --git a/include/linux/mod_device_id/pci.h b/include/linux/mod_device_id/pci.h
new file mode 100644
index 000000000000..e8d9328fa60f
--- /dev/null
+++ b/include/linux/mod_device_id/pci.h
@@ -0,0 +1,53 @@
+#ifndef LINUX_MOD_DEVICE_ID_PCI_H
+#define LINUX_MOD_DEVICE_ID_PCI_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define PCI_ANY_ID (~0)
+
+enum {
+	PCI_ID_F_VFIO_DRIVER_OVERRIDE = 1,
+};
+
+/**
+ * struct pci_device_id - PCI device ID structure
+ * @vendor:		Vendor ID to match (or PCI_ANY_ID)
+ * @device:		Device ID to match (or PCI_ANY_ID)
+ * @subvendor:		Subsystem vendor ID to match (or PCI_ANY_ID)
+ * @subdevice:		Subsystem device ID to match (or PCI_ANY_ID)
+ * @class:		Device class, subclass, and "interface" to match.
+ *			See Appendix D of the PCI Local Bus Spec or
+ *			include/linux/pci_ids.h for a full list of classes.
+ *			Most drivers do not need to specify class/class_mask
+ *			as vendor/device is normally sufficient.
+ * @class_mask:		Limit which sub-fields of the class field are compared.
+ *			See drivers/scsi/sym53c8xx_2/ for example of usage.
+ * @driver_data:	Data private to the driver.
+ *			Most drivers don't need to use driver_data field.
+ *			Best practice is to use driver_data as an index
+ *			into a static list of equivalent device types,
+ *			instead of using it as a pointer.
+ * @override_only:	Match only when dev->driver_override is this driver.
+ */
+struct pci_device_id {
+	__u32 vendor, device;		/* Vendor and device ID or PCI_ANY_ID*/
+	__u32 subvendor, subdevice;	/* Subsystem ID's or PCI_ANY_ID */
+	__u32 class, class_mask;	/* (class,subclass,prog-if) triplet */
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+	__u32 override_only;
+};
+
+/* pci_epf */
+
+#define PCI_EPF_NAME_SIZE	20
+#define PCI_EPF_MODULE_PREFIX	"pci_epf:"
+
+struct pci_epf_device_id {
+	char name[PCI_EPF_NAME_SIZE];
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_PCI_H */
diff --git a/include/linux/mod_device_id/pcmcia.h b/include/linux/mod_device_id/pcmcia.h
new file mode 100644
index 000000000000..57f4f183ea5e
--- /dev/null
+++ b/include/linux/mod_device_id/pcmcia.h
@@ -0,0 +1,47 @@
+#ifndef LINUX_MOD_DEVICE_ID_PCMCIA_H
+#define LINUX_MOD_DEVICE_ID_PCMCIA_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* PCMCIA */
+
+#define PCMCIA_DEV_ID_MATCH_MANF_ID	0x0001
+#define PCMCIA_DEV_ID_MATCH_CARD_ID	0x0002
+#define PCMCIA_DEV_ID_MATCH_FUNC_ID	0x0004
+#define PCMCIA_DEV_ID_MATCH_FUNCTION	0x0008
+#define PCMCIA_DEV_ID_MATCH_PROD_ID1	0x0010
+#define PCMCIA_DEV_ID_MATCH_PROD_ID2	0x0020
+#define PCMCIA_DEV_ID_MATCH_PROD_ID3	0x0040
+#define PCMCIA_DEV_ID_MATCH_PROD_ID4	0x0080
+#define PCMCIA_DEV_ID_MATCH_DEVICE_NO	0x0100
+#define PCMCIA_DEV_ID_MATCH_FAKE_CIS	0x0200
+#define PCMCIA_DEV_ID_MATCH_ANONYMOUS	0x0400
+
+struct pcmcia_device_id {
+	__u16		match_flags;
+
+	__u16		manf_id;
+	__u16		card_id;
+
+	__u8		func_id;
+
+	/* for real multi-function devices */
+	__u8		function;
+
+	/* for pseudo multi-function devices */
+	__u8		device_no;
+
+	__u32		prod_id_hash[4];
+
+	/* not matched against in kernelspace */
+	const char *	prod_id[4];
+
+	/* not matched against */
+	kernel_ulong_t	driver_info;
+	char *		cisfile;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_PCMCIA_H */
diff --git a/include/linux/mod_device_id/platform.h b/include/linux/mod_device_id/platform.h
new file mode 100644
index 000000000000..411fe79852c8
--- /dev/null
+++ b/include/linux/mod_device_id/platform.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_PLATFORM_H
+#define LINUX_MOD_DEVICE_ID_PLATFORM_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define PLATFORM_NAME_SIZE	24
+#define PLATFORM_MODULE_PREFIX	"platform:"
+
+struct platform_device_id {
+	char name[PLATFORM_NAME_SIZE];
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_PLATFORM_H */
diff --git a/include/linux/mod_device_id/pnp.h b/include/linux/mod_device_id/pnp.h
new file mode 100644
index 000000000000..4d572504d44d
--- /dev/null
+++ b/include/linux/mod_device_id/pnp.h
@@ -0,0 +1,25 @@
+#ifndef LINUX_MOD_DEVICE_ID_PNP_H
+#define LINUX_MOD_DEVICE_ID_PNP_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define PNP_ID_LEN	8
+#define PNP_MAX_DEVICES	8
+
+struct pnp_device_id {
+	__u8 id[PNP_ID_LEN];
+	kernel_ulong_t driver_data;
+};
+
+struct pnp_card_device_id {
+	__u8 id[PNP_ID_LEN];
+	kernel_ulong_t driver_data;
+	struct {
+		__u8 id[PNP_ID_LEN];
+	} devs[PNP_MAX_DEVICES];
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_PNP_H */
diff --git a/include/linux/mod_device_id/rio.h b/include/linux/mod_device_id/rio.h
new file mode 100644
index 000000000000..fcbc673c3d3e
--- /dev/null
+++ b/include/linux/mod_device_id/rio.h
@@ -0,0 +1,27 @@
+#ifndef LINUX_MOD_DEVICE_ID_RIO_H
+#define LINUX_MOD_DEVICE_ID_RIO_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+/* RapidIO */
+
+#define RIO_ANY_ID	0xffff
+
+/**
+ * struct rio_device_id - RIO device identifier
+ * @did: RapidIO device ID
+ * @vid: RapidIO vendor ID
+ * @asm_did: RapidIO assembly device ID
+ * @asm_vid: RapidIO assembly vendor ID
+ *
+ * Identifies a RapidIO device based on both the device/vendor IDs and
+ * the assembly device/vendor IDs.
+ */
+struct rio_device_id {
+	__u16 did, vid;
+	__u16 asm_did, asm_vid;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_RIO_H */
diff --git a/include/linux/mod_device_id/rpmsg.h b/include/linux/mod_device_id/rpmsg.h
new file mode 100644
index 000000000000..03467d5c6b4f
--- /dev/null
+++ b/include/linux/mod_device_id/rpmsg.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_MOD_DEVICE_ID_RPMSG_H
+#define LINUX_MOD_DEVICE_ID_RPMSG_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* rpmsg */
+
+#define RPMSG_NAME_SIZE			32
+#define RPMSG_DEVICE_MODALIAS_FMT	"rpmsg:%s"
+
+struct rpmsg_device_id {
+	char name[RPMSG_NAME_SIZE];
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_RPMSG_H */
diff --git a/include/linux/mod_device_id/sdio.h b/include/linux/mod_device_id/sdio.h
new file mode 100644
index 000000000000..c40733969d0b
--- /dev/null
+++ b/include/linux/mod_device_id/sdio.h
@@ -0,0 +1,20 @@
+#ifndef LINUX_MOD_DEVICE_ID_SDIO_H
+#define LINUX_MOD_DEVICE_ID_SDIO_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* SDIO */
+
+#define SDIO_ANY_ID (~0)
+
+struct sdio_device_id {
+	__u8	class;			/* Standard interface or SDIO_ANY_ID */
+	__u16	vendor;			/* Vendor or SDIO_ANY_ID */
+	__u16	device;			/* Device ID or SDIO_ANY_ID */
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SDIO_H */
diff --git a/include/linux/mod_device_id/sdw.h b/include/linux/mod_device_id/sdw.h
new file mode 100644
index 000000000000..d0c971ad1933
--- /dev/null
+++ b/include/linux/mod_device_id/sdw.h
@@ -0,0 +1,17 @@
+#ifndef LINUX_MOD_DEVICE_ID_SDW_H
+#define LINUX_MOD_DEVICE_ID_SDW_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+struct sdw_device_id {
+	__u16 mfg_id;
+	__u16 part_id;
+	__u8  sdw_version;
+	__u8  class_id;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SDW_H */
diff --git a/include/linux/mod_device_id/serio.h b/include/linux/mod_device_id/serio.h
new file mode 100644
index 000000000000..b4e9638260f9
--- /dev/null
+++ b/include/linux/mod_device_id/serio.h
@@ -0,0 +1,17 @@
+#ifndef LINUX_MOD_DEVICE_ID_SERIO_H
+#define LINUX_MOD_DEVICE_ID_SERIO_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define SERIO_ANY	0xff
+
+struct serio_device_id {
+	__u8 type;
+	__u8 extra;
+	__u8 id;
+	__u8 proto;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SERIO_H */
diff --git a/include/linux/mod_device_id/slim.h b/include/linux/mod_device_id/slim.h
new file mode 100644
index 000000000000..48054efb227c
--- /dev/null
+++ b/include/linux/mod_device_id/slim.h
@@ -0,0 +1,22 @@
+#ifndef LINUX_MOD_DEVICE_ID_SLIM_H
+#define LINUX_MOD_DEVICE_ID_SLIM_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* SLIMbus */
+
+#define SLIMBUS_NAME_SIZE	32
+#define SLIMBUS_MODULE_PREFIX	"slim:"
+
+struct slim_device_id {
+	__u16 manf_id, prod_code;
+	__u16 dev_index, instance;
+
+	/* Data private to the driver */
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SLIM_H */
diff --git a/include/linux/mod_device_id/spi.h b/include/linux/mod_device_id/spi.h
new file mode 100644
index 000000000000..62c9f49cca7a
--- /dev/null
+++ b/include/linux/mod_device_id/spi.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_MOD_DEVICE_ID_SPI_H
+#define LINUX_MOD_DEVICE_ID_SPI_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* spi */
+
+#define SPI_NAME_SIZE	32
+#define SPI_MODULE_PREFIX "spi:"
+
+struct spi_device_id {
+	char name[SPI_NAME_SIZE];
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SPI_H */
diff --git a/include/linux/mod_device_id/spmi.h b/include/linux/mod_device_id/spmi.h
new file mode 100644
index 000000000000..039c5728f92f
--- /dev/null
+++ b/include/linux/mod_device_id/spmi.h
@@ -0,0 +1,16 @@
+#ifndef LINUX_MOD_DEVICE_ID_SPMI_H
+#define LINUX_MOD_DEVICE_ID_SPMI_H
+
+#ifdef __KERNEL__
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define SPMI_NAME_SIZE	32
+#define SPMI_MODULE_PREFIX "spmi:"
+
+struct spmi_device_id {
+	char name[SPMI_NAME_SIZE];
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SPMI_H */
diff --git a/include/linux/mod_device_id/ssam.h b/include/linux/mod_device_id/ssam.h
new file mode 100644
index 000000000000..4ba32f64139b
--- /dev/null
+++ b/include/linux/mod_device_id/ssam.h
@@ -0,0 +1,27 @@
+#ifndef LINUX_MOD_DEVICE_ID_SSAM_H
+#define LINUX_MOD_DEVICE_ID_SSAM_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* Surface System Aggregator Module */
+
+#define SSAM_MATCH_TARGET	0x1
+#define SSAM_MATCH_INSTANCE	0x2
+#define SSAM_MATCH_FUNCTION	0x4
+
+struct ssam_device_id {
+	__u8 match_flags;
+
+	__u8 domain;
+	__u8 category;
+	__u8 target;
+	__u8 instance;
+	__u8 function;
+
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SSAM_H */
diff --git a/include/linux/mod_device_id/ssb.h b/include/linux/mod_device_id/ssb.h
new file mode 100644
index 000000000000..eada9e7087e1
--- /dev/null
+++ b/include/linux/mod_device_id/ssb.h
@@ -0,0 +1,23 @@
+#ifndef LINUX_MOD_DEVICE_ID_SSB_H
+#define LINUX_MOD_DEVICE_ID_SSB_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define SSB_ANY_VENDOR		0xFFFF
+#define SSB_ANY_ID		0xFFFF
+#define SSB_ANY_REV		0xFF
+
+/* SSB core, see drivers/ssb/ */
+struct ssb_device_id {
+	__u16	vendor;
+	__u16	coreid;
+	__u8	revision;
+	__u8	__pad;
+} __attribute__((packed, aligned(2)));
+
+#define SSB_DEVICE(_vendor, _coreid, _revision)  \
+	{ .vendor = _vendor, .coreid = _coreid, .revision = _revision }
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_SSB_H */
diff --git a/include/linux/mod_device_id/tb.h b/include/linux/mod_device_id/tb.h
new file mode 100644
index 000000000000..b7cb42f29056
--- /dev/null
+++ b/include/linux/mod_device_id/tb.h
@@ -0,0 +1,36 @@
+#ifndef LINUX_MOD_DEVICE_ID_TB_H
+#define LINUX_MOD_DEVICE_ID_TB_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define TBSVC_MATCH_PROTOCOL_KEY	0x0001
+#define TBSVC_MATCH_PROTOCOL_ID		0x0002
+#define TBSVC_MATCH_PROTOCOL_VERSION	0x0004
+#define TBSVC_MATCH_PROTOCOL_REVISION	0x0008
+
+/**
+ * struct tb_service_id - Thunderbolt service identifiers
+ * @match_flags: Flags used to match the structure
+ * @protocol_key: Protocol key the service supports
+ * @protocol_id: Protocol id the service supports
+ * @protocol_version: Version of the protocol
+ * @protocol_revision: Revision of the protocol software
+ * @driver_data: Driver specific data
+ *
+ * Thunderbolt XDomain services are exposed as devices where each device
+ * carries the protocol information the service supports. Thunderbolt
+ * XDomain service drivers match against that information.
+ */
+struct tb_service_id {
+	__u32 match_flags;
+	char protocol_key[8 + 1];
+	__u32 protocol_id;
+	__u32 protocol_version;
+	__u32 protocol_revision;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_TB_H */
diff --git a/include/linux/mod_device_id/tee_client.h b/include/linux/mod_device_id/tee_client.h
new file mode 100644
index 000000000000..08cc88a99a80
--- /dev/null
+++ b/include/linux/mod_device_id/tee_client.h
@@ -0,0 +1,17 @@
+#ifndef LINUX_MOD_DEVICE_ID_TEE_CLIENT_H
+#define LINUX_MOD_DEVICE_ID_TEE_CLIENT_H
+
+#ifdef __KERNEL__
+#include <linux/uuid.h>
+#endif
+
+/**
+ * struct tee_client_device_id - tee based device identifier
+ * @uuid: For TEE based client devices we use the device uuid as
+ *        the identifier.
+ */
+struct tee_client_device_id {
+	uuid_t uuid;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_TEE_CLIENT_H */
diff --git a/include/linux/mod_device_id/typec.h b/include/linux/mod_device_id/typec.h
new file mode 100644
index 000000000000..9e4b3ef09afe
--- /dev/null
+++ b/include/linux/mod_device_id/typec.h
@@ -0,0 +1,25 @@
+#ifndef LINUX_MOD_DEVICE_ID_TYPEC_H
+#define LINUX_MOD_DEVICE_ID_TYPEC_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* USB Type-C Alternate Modes */
+
+#define TYPEC_ANY_MODE	0x7
+
+/**
+ * struct typec_device_id - USB Type-C alternate mode identifiers
+ * @svid: Standard or Vendor ID
+ * @mode: Mode index
+ * @driver_data: Driver specific data
+ */
+struct typec_device_id {
+	__u16 svid;
+	__u8 mode;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_TYPEC_H */
diff --git a/include/linux/mod_device_id/ulpi.h b/include/linux/mod_device_id/ulpi.h
new file mode 100644
index 000000000000..a40fa1218c31
--- /dev/null
+++ b/include/linux/mod_device_id/ulpi.h
@@ -0,0 +1,15 @@
+#ifndef LINUX_MOD_DEVICE_ID_ULPI_H
+#define LINUX_MOD_DEVICE_ID_ULPI_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+struct ulpi_device_id {
+	__u16 vendor;
+	__u16 product;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_ULPI_H */
diff --git a/include/linux/mod_device_id/usb.h b/include/linux/mod_device_id/usb.h
new file mode 100644
index 000000000000..5f987973de8e
--- /dev/null
+++ b/include/linux/mod_device_id/usb.h
@@ -0,0 +1,110 @@
+#ifndef LINUX_MOD_DEVICE_ID_USB_H
+#define LINUX_MOD_DEVICE_ID_USB_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/*
+ * Device table entry for "new style" table-driven USB drivers.
+ * User mode code can read these tables to choose which modules to load.
+ * Declare the table as a MODULE_DEVICE_TABLE.
+ *
+ * A probe() parameter will point to a matching entry from this table.
+ * Use the driver_info field for each match to hold information tied
+ * to that match:  device quirks, etc.
+ *
+ * Terminate the driver's table with an all-zeroes entry.
+ * Use the flag values to control which fields are compared.
+ */
+
+/**
+ * struct usb_device_id - identifies USB devices for probing and hotplugging
+ * @match_flags: Bit mask controlling which of the other fields are used to
+ *	match against new devices. Any field except for driver_info may be
+ *	used, although some only make sense in conjunction with other fields.
+ *	This is usually set by a USB_DEVICE_*() macro, which sets all
+ *	other fields in this structure except for driver_info.
+ * @idVendor: USB vendor ID for a device; numbers are assigned
+ *	by the USB forum to its members.
+ * @idProduct: Vendor-assigned product ID.
+ * @bcdDevice_lo: Low end of range of vendor-assigned product version numbers.
+ *	This is also used to identify individual product versions, for
+ *	a range consisting of a single device.
+ * @bcdDevice_hi: High end of version number range.  The range of product
+ *	versions is inclusive.
+ * @bDeviceClass: Class of device; numbers are assigned
+ *	by the USB forum.  Products may choose to implement classes,
+ *	or be vendor-specific.  Device classes specify behavior of all
+ *	the interfaces on a device.
+ * @bDeviceSubClass: Subclass of device; associated with bDeviceClass.
+ * @bDeviceProtocol: Protocol of device; associated with bDeviceClass.
+ * @bInterfaceClass: Class of interface; numbers are assigned
+ *	by the USB forum.  Products may choose to implement classes,
+ *	or be vendor-specific.  Interface classes specify behavior only
+ *	of a given interface; other interfaces may support other classes.
+ * @bInterfaceSubClass: Subclass of interface; associated with bInterfaceClass.
+ * @bInterfaceProtocol: Protocol of interface; associated with bInterfaceClass.
+ * @bInterfaceNumber: Number of interface; composite devices may use
+ *	fixed interface numbers to differentiate between vendor-specific
+ *	interfaces.
+ * @driver_info: Holds information used by the driver.  Usually it holds
+ *	a pointer to a descriptor understood by the driver, or perhaps
+ *	device flags.
+ *
+ * In most cases, drivers will create a table of device IDs by using
+ * USB_DEVICE(), or similar macros designed for that purpose.
+ * They will then export it to userspace using MODULE_DEVICE_TABLE(),
+ * and provide it to the USB core through their usb_driver structure.
+ *
+ * See the usb_match_id() function for information about how matches are
+ * performed.  Briefly, you will normally use one of several macros to help
+ * construct these entries.  Each entry you provide will either identify
+ * one or more specific products, or will identify a class of products
+ * which have agreed to behave the same.  You should put the more specific
+ * matches towards the beginning of your table, so that driver_info can
+ * record quirks of specific products.
+ */
+struct usb_device_id {
+	/* which fields to match against? */
+	__u16		match_flags;
+
+	/* Used for product specific matches; range is inclusive */
+	__u16		idVendor;
+	__u16		idProduct;
+	__u16		bcdDevice_lo;
+	__u16		bcdDevice_hi;
+
+	/* Used for device class matches */
+	__u8		bDeviceClass;
+	__u8		bDeviceSubClass;
+	__u8		bDeviceProtocol;
+
+	/* Used for interface class matches */
+	__u8		bInterfaceClass;
+	__u8		bInterfaceSubClass;
+	__u8		bInterfaceProtocol;
+
+	/* Used for vendor-specific interface matches */
+	__u8		bInterfaceNumber;
+
+	/* not matched against */
+	kernel_ulong_t	driver_info
+		__attribute__((aligned(sizeof(kernel_ulong_t))));
+};
+
+/* Some useful macros to use to create struct usb_device_id */
+#define USB_DEVICE_ID_MATCH_VENDOR		0x0001
+#define USB_DEVICE_ID_MATCH_PRODUCT		0x0002
+#define USB_DEVICE_ID_MATCH_DEV_LO		0x0004
+#define USB_DEVICE_ID_MATCH_DEV_HI		0x0008
+#define USB_DEVICE_ID_MATCH_DEV_CLASS		0x0010
+#define USB_DEVICE_ID_MATCH_DEV_SUBCLASS	0x0020
+#define USB_DEVICE_ID_MATCH_DEV_PROTOCOL	0x0040
+#define USB_DEVICE_ID_MATCH_INT_CLASS		0x0080
+#define USB_DEVICE_ID_MATCH_INT_SUBCLASS	0x0100
+#define USB_DEVICE_ID_MATCH_INT_PROTOCOL	0x0200
+#define USB_DEVICE_ID_MATCH_INT_NUMBER		0x0400
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_USB_H */
diff --git a/include/linux/mod_device_id/vchiq.h b/include/linux/mod_device_id/vchiq.h
new file mode 100644
index 000000000000..9128fb449ad7
--- /dev/null
+++ b/include/linux/mod_device_id/vchiq.h
@@ -0,0 +1,8 @@
+#ifndef LINUX_MOD_DEVICE_ID_VCHIQ_H
+#define LINUX_MOD_DEVICE_ID_VCHIQ_H
+
+struct vchiq_device_id {
+	char name[32];
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_VCHIQ_H */
diff --git a/include/linux/mod_device_id/vio.h b/include/linux/mod_device_id/vio.h
new file mode 100644
index 000000000000..90df7b5cce4e
--- /dev/null
+++ b/include/linux/mod_device_id/vio.h
@@ -0,0 +1,10 @@
+#ifndef LINUX_MOD_DEVICE_ID_VIO_H
+#define LINUX_MOD_DEVICE_ID_VIO_H
+
+/* VIO */
+struct vio_device_id {
+	char type[32];
+	char compat[32];
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_VIO_H */
diff --git a/include/linux/mod_device_id/virtio.h b/include/linux/mod_device_id/virtio.h
new file mode 100644
index 000000000000..4931ab84d489
--- /dev/null
+++ b/include/linux/mod_device_id/virtio.h
@@ -0,0 +1,15 @@
+#ifndef LINUX_MOD_DEVICE_ID_VIRTIO_H
+#define LINUX_MOD_DEVICE_ID_VIRTIO_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+
+#define VIRTIO_DEV_ANY_ID	0xffffffff
+
+struct virtio_device_id {
+	__u32 device;
+	__u32 vendor;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_VIRTIO_H */
diff --git a/include/linux/mod_device_id/wmi.h b/include/linux/mod_device_id/wmi.h
new file mode 100644
index 000000000000..d1aeb688eeed
--- /dev/null
+++ b/include/linux/mod_device_id/wmi.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_MOD_DEVICE_ID_WMI_H
+#define LINUX_MOD_DEVICE_ID_WMI_H
+
+/* WMI */
+
+#define WMI_MODULE_PREFIX	"wmi:"
+
+/**
+ * struct wmi_device_id - WMI device identifier
+ * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
+ * @context: pointer to driver specific data
+ */
+struct wmi_device_id {
+	const char guid_string[UUID_STRING_LEN+1];
+	const void *context;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_WMI_H */
diff --git a/include/linux/mod_device_id/x86_cpu.h b/include/linux/mod_device_id/x86_cpu.h
new file mode 100644
index 000000000000..46c1df6f0f9c
--- /dev/null
+++ b/include/linux/mod_device_id/x86_cpu.h
@@ -0,0 +1,43 @@
+#ifndef LINUX_MOD_DEVICE_ID_X86_CPU_H
+#define LINUX_MOD_DEVICE_ID_X86_CPU_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+/* Wild cards for x86_cpu_id::vendor, family, model and feature */
+#define X86_VENDOR_ANY 0xffff
+#define X86_FAMILY_ANY 0
+#define X86_MODEL_ANY  0
+#define X86_STEPPING_ANY 0
+#define X86_STEP_MIN 0
+#define X86_STEP_MAX 0xf
+#define X86_PLATFORM_ANY 0x0
+#define X86_FEATURE_ANY 0	/* Same as FPU, you can't test for that */
+#define X86_CPU_TYPE_ANY 0
+
+/*
+ * Match x86 CPUs for CPU specific drivers.
+ * See documentation of "x86_match_cpu" for details.
+ */
+
+/*
+ * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id.
+ * Although gcc seems to ignore this error, clang fails without this define.
+ */
+#define x86cpu_device_id x86_cpu_id
+struct x86_cpu_id {
+	__u16 vendor;
+	__u16 family;
+	__u16 model;
+	__u16 steppings;
+	__u16 feature;	/* bit index */
+	/* Solely for kernel-internal use: DO NOT EXPORT to userspace! */
+	__u16 flags;
+	__u8  platform_mask;
+	__u8  type;
+	kernel_ulong_t driver_data;
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_X86_CPU_H */
diff --git a/include/linux/mod_device_id/zorro.h b/include/linux/mod_device_id/zorro.h
new file mode 100644
index 000000000000..ce1e1794f38c
--- /dev/null
+++ b/include/linux/mod_device_id/zorro.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_MOD_DEVICE_ID_ZORRO_H
+#define LINUX_MOD_DEVICE_ID_ZORRO_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+typedef unsigned long kernel_ulong_t;
+#endif
+
+#define ZORRO_WILDCARD			(0xffffffff)	/* not official */
+
+#define ZORRO_DEVICE_MODALIAS_FMT	"zorro:i%08X"
+
+struct zorro_device_id {
+	__u32 id;			/* Device ID or ZORRO_WILDCARD */
+	kernel_ulong_t driver_data;	/* Data private to the driver */
+};
+
+#endif /* ifndef LINUX_MOD_DEVICE_ID_ZORRO_H */
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 3b0c9a251a2e..ddb1dc5349ce 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -9,706 +9,65 @@
 #define LINUX_MOD_DEVICETABLE_H
 
 #ifdef __KERNEL__
-#include <linux/mei.h>
 #include <linux/types.h>
-#include <linux/uuid.h>
-typedef unsigned long kernel_ulong_t;
 #endif
 
-#define PCI_ANY_ID (~0)
-
-enum {
-	PCI_ID_F_VFIO_DRIVER_OVERRIDE = 1,
-};
-
-/**
- * struct pci_device_id - PCI device ID structure
- * @vendor:		Vendor ID to match (or PCI_ANY_ID)
- * @device:		Device ID to match (or PCI_ANY_ID)
- * @subvendor:		Subsystem vendor ID to match (or PCI_ANY_ID)
- * @subdevice:		Subsystem device ID to match (or PCI_ANY_ID)
- * @class:		Device class, subclass, and "interface" to match.
- *			See Appendix D of the PCI Local Bus Spec or
- *			include/linux/pci_ids.h for a full list of classes.
- *			Most drivers do not need to specify class/class_mask
- *			as vendor/device is normally sufficient.
- * @class_mask:		Limit which sub-fields of the class field are compared.
- *			See drivers/scsi/sym53c8xx_2/ for example of usage.
- * @driver_data:	Data private to the driver.
- *			Most drivers don't need to use driver_data field.
- *			Best practice is to use driver_data as an index
- *			into a static list of equivalent device types,
- *			instead of using it as a pointer.
- * @override_only:	Match only when dev->driver_override is this driver.
- */
-struct pci_device_id {
-	__u32 vendor, device;		/* Vendor and device ID or PCI_ANY_ID*/
-	__u32 subvendor, subdevice;	/* Subsystem ID's or PCI_ANY_ID */
-	__u32 class, class_mask;	/* (class,subclass,prog-if) triplet */
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-	__u32 override_only;
-};
-
-
-#define IEEE1394_MATCH_VENDOR_ID	0x0001
-#define IEEE1394_MATCH_MODEL_ID		0x0002
-#define IEEE1394_MATCH_SPECIFIER_ID	0x0004
-#define IEEE1394_MATCH_VERSION		0x0008
-
-struct ieee1394_device_id {
-	__u32 match_flags;
-	__u32 vendor_id;
-	__u32 model_id;
-	__u32 specifier_id;
-	__u32 version;
-	union {
-		kernel_ulong_t driver_data;
-		const void *driver_data_ptr;
-	};
-};
-
-
-/*
- * Device table entry for "new style" table-driven USB drivers.
- * User mode code can read these tables to choose which modules to load.
- * Declare the table as a MODULE_DEVICE_TABLE.
- *
- * A probe() parameter will point to a matching entry from this table.
- * Use the driver_info field for each match to hold information tied
- * to that match:  device quirks, etc.
- *
- * Terminate the driver's table with an all-zeroes entry.
- * Use the flag values to control which fields are compared.
- */
-
-/**
- * struct usb_device_id - identifies USB devices for probing and hotplugging
- * @match_flags: Bit mask controlling which of the other fields are used to
- *	match against new devices. Any field except for driver_info may be
- *	used, although some only make sense in conjunction with other fields.
- *	This is usually set by a USB_DEVICE_*() macro, which sets all
- *	other fields in this structure except for driver_info.
- * @idVendor: USB vendor ID for a device; numbers are assigned
- *	by the USB forum to its members.
- * @idProduct: Vendor-assigned product ID.
- * @bcdDevice_lo: Low end of range of vendor-assigned product version numbers.
- *	This is also used to identify individual product versions, for
- *	a range consisting of a single device.
- * @bcdDevice_hi: High end of version number range.  The range of product
- *	versions is inclusive.
- * @bDeviceClass: Class of device; numbers are assigned
- *	by the USB forum.  Products may choose to implement classes,
- *	or be vendor-specific.  Device classes specify behavior of all
- *	the interfaces on a device.
- * @bDeviceSubClass: Subclass of device; associated with bDeviceClass.
- * @bDeviceProtocol: Protocol of device; associated with bDeviceClass.
- * @bInterfaceClass: Class of interface; numbers are assigned
- *	by the USB forum.  Products may choose to implement classes,
- *	or be vendor-specific.  Interface classes specify behavior only
- *	of a given interface; other interfaces may support other classes.
- * @bInterfaceSubClass: Subclass of interface; associated with bInterfaceClass.
- * @bInterfaceProtocol: Protocol of interface; associated with bInterfaceClass.
- * @bInterfaceNumber: Number of interface; composite devices may use
- *	fixed interface numbers to differentiate between vendor-specific
- *	interfaces.
- * @driver_info: Holds information used by the driver.  Usually it holds
- *	a pointer to a descriptor understood by the driver, or perhaps
- *	device flags.
- *
- * In most cases, drivers will create a table of device IDs by using
- * USB_DEVICE(), or similar macros designed for that purpose.
- * They will then export it to userspace using MODULE_DEVICE_TABLE(),
- * and provide it to the USB core through their usb_driver structure.
- *
- * See the usb_match_id() function for information about how matches are
- * performed.  Briefly, you will normally use one of several macros to help
- * construct these entries.  Each entry you provide will either identify
- * one or more specific products, or will identify a class of products
- * which have agreed to behave the same.  You should put the more specific
- * matches towards the beginning of your table, so that driver_info can
- * record quirks of specific products.
- */
-struct usb_device_id {
-	/* which fields to match against? */
-	__u16		match_flags;
-
-	/* Used for product specific matches; range is inclusive */
-	__u16		idVendor;
-	__u16		idProduct;
-	__u16		bcdDevice_lo;
-	__u16		bcdDevice_hi;
-
-	/* Used for device class matches */
-	__u8		bDeviceClass;
-	__u8		bDeviceSubClass;
-	__u8		bDeviceProtocol;
-
-	/* Used for interface class matches */
-	__u8		bInterfaceClass;
-	__u8		bInterfaceSubClass;
-	__u8		bInterfaceProtocol;
-
-	/* Used for vendor-specific interface matches */
-	__u8		bInterfaceNumber;
-
-	/* not matched against */
-	kernel_ulong_t	driver_info
-		__attribute__((aligned(sizeof(kernel_ulong_t))));
-};
-
-/* Some useful macros to use to create struct usb_device_id */
-#define USB_DEVICE_ID_MATCH_VENDOR		0x0001
-#define USB_DEVICE_ID_MATCH_PRODUCT		0x0002
-#define USB_DEVICE_ID_MATCH_DEV_LO		0x0004
-#define USB_DEVICE_ID_MATCH_DEV_HI		0x0008
-#define USB_DEVICE_ID_MATCH_DEV_CLASS		0x0010
-#define USB_DEVICE_ID_MATCH_DEV_SUBCLASS	0x0020
-#define USB_DEVICE_ID_MATCH_DEV_PROTOCOL	0x0040
-#define USB_DEVICE_ID_MATCH_INT_CLASS		0x0080
-#define USB_DEVICE_ID_MATCH_INT_SUBCLASS	0x0100
-#define USB_DEVICE_ID_MATCH_INT_PROTOCOL	0x0200
-#define USB_DEVICE_ID_MATCH_INT_NUMBER		0x0400
-
-#define HID_ANY_ID				(~0)
-#define HID_BUS_ANY				0xffff
-#define HID_GROUP_ANY				0x0000
-
-struct hid_device_id {
-	__u16 bus;
-	__u16 group;
-	__u32 vendor;
-	__u32 product;
-	kernel_ulong_t driver_data;
-};
-
-/* s390 CCW devices */
-struct ccw_device_id {
-	__u16	match_flags;	/* which fields to match against */
-
-	__u16	cu_type;	/* control unit type     */
-	__u16	dev_type;	/* device type           */
-	__u8	cu_model;	/* control unit model    */
-	__u8	dev_model;	/* device model          */
-
-	kernel_ulong_t driver_info;
-};
-
-#define CCW_DEVICE_ID_MATCH_CU_TYPE		0x01
-#define CCW_DEVICE_ID_MATCH_CU_MODEL		0x02
-#define CCW_DEVICE_ID_MATCH_DEVICE_TYPE		0x04
-#define CCW_DEVICE_ID_MATCH_DEVICE_MODEL	0x08
-
-/* s390 AP bus devices */
-struct ap_device_id {
-	__u16 match_flags;	/* which fields to match against */
-	__u8 dev_type;		/* device type */
-	kernel_ulong_t driver_info;
-};
-
-#define AP_DEVICE_ID_MATCH_CARD_TYPE		0x01
-#define AP_DEVICE_ID_MATCH_QUEUE_TYPE		0x02
-
-/* s390 css bus devices (subchannels) */
-struct css_device_id {
-	__u8 match_flags;
-	__u8 type; /* subchannel type */
-	kernel_ulong_t driver_data;
-};
-
-#define ACPI_ID_LEN	16
-
-struct acpi_device_id {
-	__u8 id[ACPI_ID_LEN];
-	kernel_ulong_t driver_data;
-	__u32 cls;
-	__u32 cls_msk;
-};
-
-/**
- * ACPI_DEVICE_CLASS - macro used to describe an ACPI device with
- * the PCI-defined class-code information
- *
- * @_cls : the class, subclass, prog-if triple for this device
- * @_msk : the class mask for this device
- *
- * This macro is used to create a struct acpi_device_id that matches a
- * specific PCI class. The .id and .driver_data fields will be left
- * initialized with the default value.
- */
-#define ACPI_DEVICE_CLASS(_cls, _msk)	.cls = (_cls), .cls_msk = (_msk),
-
-#define PNP_ID_LEN	8
-#define PNP_MAX_DEVICES	8
-
-struct pnp_device_id {
-	__u8 id[PNP_ID_LEN];
-	kernel_ulong_t driver_data;
-};
-
-struct pnp_card_device_id {
-	__u8 id[PNP_ID_LEN];
-	kernel_ulong_t driver_data;
-	struct {
-		__u8 id[PNP_ID_LEN];
-	} devs[PNP_MAX_DEVICES];
-};
-
-
-#define SERIO_ANY	0xff
-
-struct serio_device_id {
-	__u8 type;
-	__u8 extra;
-	__u8 id;
-	__u8 proto;
-};
-
-struct hda_device_id {
-	__u32 vendor_id;
-	__u32 rev_id;
-	__u8 api_version;
-	const char *name;
-	unsigned long driver_data;
-};
-
-struct sdw_device_id {
-	__u16 mfg_id;
-	__u16 part_id;
-	__u8  sdw_version;
-	__u8  class_id;
-	kernel_ulong_t driver_data;
-};
-
-/*
- * Struct used for matching a device
- */
-struct of_device_id {
-	char	name[32];
-	char	type[32];
-	char	compatible[128];
-	const void *data;
-};
-
-/* VIO */
-struct vio_device_id {
-	char type[32];
-	char compat[32];
-};
-
-/* PCMCIA */
-
-struct pcmcia_device_id {
-	__u16		match_flags;
-
-	__u16		manf_id;
-	__u16		card_id;
-
-	__u8		func_id;
-
-	/* for real multi-function devices */
-	__u8		function;
-
-	/* for pseudo multi-function devices */
-	__u8		device_no;
-
-	__u32		prod_id_hash[4];
-
-	/* not matched against in kernelspace */
-	const char *	prod_id[4];
-
-	/* not matched against */
-	kernel_ulong_t	driver_info;
-	char *		cisfile;
-};
-
-#define PCMCIA_DEV_ID_MATCH_MANF_ID	0x0001
-#define PCMCIA_DEV_ID_MATCH_CARD_ID	0x0002
-#define PCMCIA_DEV_ID_MATCH_FUNC_ID	0x0004
-#define PCMCIA_DEV_ID_MATCH_FUNCTION	0x0008
-#define PCMCIA_DEV_ID_MATCH_PROD_ID1	0x0010
-#define PCMCIA_DEV_ID_MATCH_PROD_ID2	0x0020
-#define PCMCIA_DEV_ID_MATCH_PROD_ID3	0x0040
-#define PCMCIA_DEV_ID_MATCH_PROD_ID4	0x0080
-#define PCMCIA_DEV_ID_MATCH_DEVICE_NO	0x0100
-#define PCMCIA_DEV_ID_MATCH_FAKE_CIS	0x0200
-#define PCMCIA_DEV_ID_MATCH_ANONYMOUS	0x0400
-
-/* Input */
-#define INPUT_DEVICE_ID_EV_MAX		0x1f
-#define INPUT_DEVICE_ID_KEY_MIN_INTERESTING	0x71
-#define INPUT_DEVICE_ID_KEY_MAX		0x2ff
-#define INPUT_DEVICE_ID_REL_MAX		0x0f
-#define INPUT_DEVICE_ID_ABS_MAX		0x3f
-#define INPUT_DEVICE_ID_MSC_MAX		0x07
-#define INPUT_DEVICE_ID_LED_MAX		0x0f
-#define INPUT_DEVICE_ID_SND_MAX		0x07
-#define INPUT_DEVICE_ID_FF_MAX		0x7f
-#define INPUT_DEVICE_ID_SW_MAX		0x11
-#define INPUT_DEVICE_ID_PROP_MAX	0x1f
-
-#define INPUT_DEVICE_ID_MATCH_BUS	1
-#define INPUT_DEVICE_ID_MATCH_VENDOR	2
-#define INPUT_DEVICE_ID_MATCH_PRODUCT	4
-#define INPUT_DEVICE_ID_MATCH_VERSION	8
-
-#define INPUT_DEVICE_ID_MATCH_EVBIT	0x0010
-#define INPUT_DEVICE_ID_MATCH_KEYBIT	0x0020
-#define INPUT_DEVICE_ID_MATCH_RELBIT	0x0040
-#define INPUT_DEVICE_ID_MATCH_ABSBIT	0x0080
-#define INPUT_DEVICE_ID_MATCH_MSCIT	0x0100
-#define INPUT_DEVICE_ID_MATCH_LEDBIT	0x0200
-#define INPUT_DEVICE_ID_MATCH_SNDBIT	0x0400
-#define INPUT_DEVICE_ID_MATCH_FFBIT	0x0800
-#define INPUT_DEVICE_ID_MATCH_SWBIT	0x1000
-#define INPUT_DEVICE_ID_MATCH_PROPBIT	0x2000
-
-struct input_device_id {
-
-	kernel_ulong_t flags;
-
-	__u16 bustype;
-	__u16 vendor;
-	__u16 product;
-	__u16 version;
-
-	kernel_ulong_t evbit[INPUT_DEVICE_ID_EV_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t keybit[INPUT_DEVICE_ID_KEY_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t relbit[INPUT_DEVICE_ID_REL_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t absbit[INPUT_DEVICE_ID_ABS_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t mscbit[INPUT_DEVICE_ID_MSC_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t ledbit[INPUT_DEVICE_ID_LED_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t sndbit[INPUT_DEVICE_ID_SND_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t ffbit[INPUT_DEVICE_ID_FF_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t swbit[INPUT_DEVICE_ID_SW_MAX / BITS_PER_LONG + 1];
-	kernel_ulong_t propbit[INPUT_DEVICE_ID_PROP_MAX / BITS_PER_LONG + 1];
-
-	kernel_ulong_t driver_info;
-};
-
-/* EISA */
-
-#define EISA_SIG_LEN   8
-
-/* The EISA signature, in ASCII form, null terminated */
-struct eisa_device_id {
-	char          sig[EISA_SIG_LEN];
-	kernel_ulong_t driver_data;
-};
-
-#define EISA_DEVICE_MODALIAS_FMT "eisa:s%s"
-
-struct parisc_device_id {
-	__u8	hw_type;	/* 5 bits used */
-	__u8	hversion_rev;	/* 4 bits */
-	__u16	hversion;	/* 12 bits */
-	__u32	sversion;	/* 20 bits */
-};
-
-#define PA_HWTYPE_ANY_ID	0xff
-#define PA_HVERSION_REV_ANY_ID	0xff
-#define PA_HVERSION_ANY_ID	0xffff
-#define PA_SVERSION_ANY_ID	0xffffffff
-
-/* SDIO */
-
-#define SDIO_ANY_ID (~0)
-
-struct sdio_device_id {
-	__u8	class;			/* Standard interface or SDIO_ANY_ID */
-	__u16	vendor;			/* Vendor or SDIO_ANY_ID */
-	__u16	device;			/* Device ID or SDIO_ANY_ID */
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-/* SSB core, see drivers/ssb/ */
-struct ssb_device_id {
-	__u16	vendor;
-	__u16	coreid;
-	__u8	revision;
-	__u8	__pad;
-} __attribute__((packed, aligned(2)));
-#define SSB_DEVICE(_vendor, _coreid, _revision)  \
-	{ .vendor = _vendor, .coreid = _coreid, .revision = _revision, }
-
-#define SSB_ANY_VENDOR		0xFFFF
-#define SSB_ANY_ID		0xFFFF
-#define SSB_ANY_REV		0xFF
-
-/* Broadcom's specific AMBA core, see drivers/bcma/ */
-struct bcma_device_id {
-	__u16	manuf;
-	__u16	id;
-	__u8	rev;
-	__u8	class;
-} __attribute__((packed,aligned(2)));
-#define BCMA_CORE(_manuf, _id, _rev, _class)  \
-	{ .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, }
-
-#define BCMA_ANY_MANUF		0xFFFF
-#define BCMA_ANY_ID		0xFFFF
-#define BCMA_ANY_REV		0xFF
-#define BCMA_ANY_CLASS		0xFF
-
-struct virtio_device_id {
-	__u32 device;
-	__u32 vendor;
-};
-#define VIRTIO_DEV_ANY_ID	0xffffffff
-
-/*
- * For Hyper-V devices we use the device guid as the id.
- */
-struct hv_vmbus_device_id {
-	guid_t guid;
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-/* rpmsg */
-
-#define RPMSG_NAME_SIZE			32
-#define RPMSG_DEVICE_MODALIAS_FMT	"rpmsg:%s"
-
-struct rpmsg_device_id {
-	char name[RPMSG_NAME_SIZE];
-	kernel_ulong_t driver_data;
-};
-
-/* i2c */
-
-#define I2C_NAME_SIZE	20
-#define I2C_MODULE_PREFIX "i2c:"
-
-struct i2c_device_id {
-	char name[I2C_NAME_SIZE];
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-/* pci_epf */
-
-#define PCI_EPF_NAME_SIZE	20
-#define PCI_EPF_MODULE_PREFIX	"pci_epf:"
-
-struct pci_epf_device_id {
-	char name[PCI_EPF_NAME_SIZE];
-	kernel_ulong_t driver_data;
-};
-
-/* i3c */
-
-#define I3C_MATCH_DCR			0x1
-#define I3C_MATCH_MANUF			0x2
-#define I3C_MATCH_PART			0x4
-#define I3C_MATCH_EXTRA_INFO		0x8
-
-struct i3c_device_id {
-	__u8 match_flags;
-	__u8 dcr;
-	__u16 manuf_id;
-	__u16 part_id;
-	__u16 extra_info;
-
-	const void *data;
-};
-
-/* spi */
-
-#define SPI_NAME_SIZE	32
-#define SPI_MODULE_PREFIX "spi:"
-
-struct spi_device_id {
-	char name[SPI_NAME_SIZE];
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-/* SLIMbus */
-
-#define SLIMBUS_NAME_SIZE	32
-#define SLIMBUS_MODULE_PREFIX	"slim:"
-
-struct slim_device_id {
-	__u16 manf_id, prod_code;
-	__u16 dev_index, instance;
-
-	/* Data private to the driver */
-	kernel_ulong_t driver_data;
-};
-
-#define APR_NAME_SIZE	32
-#define APR_MODULE_PREFIX "apr:"
-
-struct apr_device_id {
-	char name[APR_NAME_SIZE];
-	__u32 domain_id;
-	__u32 svc_id;
-	__u32 svc_version;
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-#define SPMI_NAME_SIZE	32
-#define SPMI_MODULE_PREFIX "spmi:"
-
-struct spmi_device_id {
-	char name[SPMI_NAME_SIZE];
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-/* dmi */
-enum dmi_field {
-	DMI_NONE,
-	DMI_BIOS_VENDOR,
-	DMI_BIOS_VERSION,
-	DMI_BIOS_DATE,
-	DMI_BIOS_RELEASE,
-	DMI_EC_FIRMWARE_RELEASE,
-	DMI_SYS_VENDOR,
-	DMI_PRODUCT_NAME,
-	DMI_PRODUCT_VERSION,
-	DMI_PRODUCT_SERIAL,
-	DMI_PRODUCT_UUID,
-	DMI_PRODUCT_SKU,
-	DMI_PRODUCT_FAMILY,
-	DMI_BOARD_VENDOR,
-	DMI_BOARD_NAME,
-	DMI_BOARD_VERSION,
-	DMI_BOARD_SERIAL,
-	DMI_BOARD_ASSET_TAG,
-	DMI_CHASSIS_VENDOR,
-	DMI_CHASSIS_TYPE,
-	DMI_CHASSIS_VERSION,
-	DMI_CHASSIS_SERIAL,
-	DMI_CHASSIS_ASSET_TAG,
-	DMI_STRING_MAX,
-	DMI_OEM_STRING,	/* special case - will not be in dmi_ident */
-};
-
-struct dmi_strmatch {
-	unsigned char slot:7;
-	unsigned char exact_match:1;
-	char substr[79];
-};
-
-struct dmi_system_id {
-	int (*callback)(const struct dmi_system_id *);
-	const char *ident;
-	struct dmi_strmatch matches[4];
-	void *driver_data;
-};
-/*
- * struct dmi_device_id appears during expansion of
- * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
- * but this is enough for gcc 3.4.6 to error out:
- *	error: storage size of '__mod_dmi_device_table' isn't known
- */
-#define dmi_device_id dmi_system_id
-
-#define DMI_MATCH(a, b)	{ .slot = a, .substr = b }
-#define DMI_EXACT_MATCH(a, b)	{ .slot = a, .substr = b, .exact_match = 1 }
-
-#define PLATFORM_NAME_SIZE	24
-#define PLATFORM_MODULE_PREFIX	"platform:"
-
-struct platform_device_id {
-	char name[PLATFORM_NAME_SIZE];
-	kernel_ulong_t driver_data;
-};
-
-#define MDIO_MODULE_PREFIX	"mdio:"
-
-#define MDIO_ID_FMT "%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u"
-#define MDIO_ID_ARGS(_id) \
-	((_id)>>31) & 1, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \
-	((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \
-	((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \
-	((_id)>>19) & 1, ((_id)>>18) & 1, ((_id)>>17) & 1, ((_id)>>16) & 1, \
-	((_id)>>15) & 1, ((_id)>>14) & 1, ((_id)>>13) & 1, ((_id)>>12) & 1, \
-	((_id)>>11) & 1, ((_id)>>10) & 1, ((_id)>>9) & 1, ((_id)>>8) & 1, \
-	((_id)>>7) & 1, ((_id)>>6) & 1, ((_id)>>5) & 1, ((_id)>>4) & 1, \
-	((_id)>>3) & 1, ((_id)>>2) & 1, ((_id)>>1) & 1, (_id) & 1
-
-/**
- * struct mdio_device_id - identifies PHY devices on an MDIO/MII bus
- * @phy_id: The result of
- *     (mdio_read(&MII_PHYSID1) << 16 | mdio_read(&MII_PHYSID2)) & @phy_id_mask
- *     for this PHY type
- * @phy_id_mask: Defines the significant bits of @phy_id.  A value of 0
- *     is used to terminate an array of struct mdio_device_id.
- */
-struct mdio_device_id {
-	__u32 phy_id;
-	__u32 phy_id_mask;
-};
-
-struct zorro_device_id {
-	__u32 id;			/* Device ID or ZORRO_WILDCARD */
-	kernel_ulong_t driver_data;	/* Data private to the driver */
-};
-
-#define ZORRO_WILDCARD			(0xffffffff)	/* not official */
-
-#define ZORRO_DEVICE_MODALIAS_FMT	"zorro:i%08X"
-
-#define ISAPNP_ANY_ID		0xffff
-struct isapnp_device_id {
-	unsigned short card_vendor, card_device;
-	unsigned short vendor, function;
-	kernel_ulong_t driver_data;	/* data private to the driver */
-};
-
-/**
- * struct amba_id - identifies a device on an AMBA bus
- * @id: The significant bits if the hardware device ID
- * @mask: Bitmask specifying which bits of the id field are significant when
- *	matching.  A driver binds to a device when ((hardware device ID) & mask)
- *	== id.
- * @data: Private data used by the driver.
- */
-struct amba_id {
-	unsigned int		id;
-	unsigned int		mask;
-	void			*data;
-};
-
-/**
- * struct mips_cdmm_device_id - identifies devices in MIPS CDMM bus
- * @type:	Device type identifier.
- */
-struct mips_cdmm_device_id {
-	__u8	type;
-};
-
-/*
- * Match x86 CPUs for CPU specific drivers.
- * See documentation of "x86_match_cpu" for details.
- */
-
-/*
- * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id.
- * Although gcc seems to ignore this error, clang fails without this define.
- */
-#define x86cpu_device_id x86_cpu_id
-struct x86_cpu_id {
-	__u16 vendor;
-	__u16 family;
-	__u16 model;
-	__u16 steppings;
-	__u16 feature;	/* bit index */
-	/* Solely for kernel-internal use: DO NOT EXPORT to userspace! */
-	__u16 flags;
-	__u8  platform_mask;
-	__u8  type;
-	kernel_ulong_t driver_data;
-};
-
-/* Wild cards for x86_cpu_id::vendor, family, model and feature */
-#define X86_VENDOR_ANY 0xffff
-#define X86_FAMILY_ANY 0
-#define X86_MODEL_ANY  0
-#define X86_STEPPING_ANY 0
-#define X86_STEP_MIN 0
-#define X86_STEP_MAX 0xf
-#define X86_PLATFORM_ANY 0x0
-#define X86_FEATURE_ANY 0	/* Same as FPU, you can't test for that */
-#define X86_CPU_TYPE_ANY 0
+#include "mod_device_id/acpi.h"
+#include "mod_device_id/amba.h"
+#include "mod_device_id/ap.h"
+#include "mod_device_id/apr.h"
+#include "mod_device_id/auxiliary.h"
+#include "mod_device_id/bcma.h"
+#include "mod_device_id/ccw.h"
+#include "mod_device_id/cdx.h"
+#include "mod_device_id/coreboot.h"
+#include "mod_device_id/css.h"
+#include "mod_device_id/dfl.h"
+#include "mod_device_id/dmi.h"
+#include "mod_device_id/eisa.h"
+#include "mod_device_id/fsl_mc.h"
+#include "mod_device_id/hda.h"
+#include "mod_device_id/hid.h"
+#include "mod_device_id/hv_vmbus.h"
+#include "mod_device_id/i2c.h"
+#include "mod_device_id/i3c.h"
+#include "mod_device_id/ieee1394.h"
+#include "mod_device_id/input.h"
+#include "mod_device_id/ipack.h"
+#include "mod_device_id/isapnp.h"
+#include "mod_device_id/ishtp.h"
+#include "mod_device_id/mcb.h"
+#include "mod_device_id/mdio.h"
+#include "mod_device_id/mei_cl.h"
+#include "mod_device_id/mhi.h"
+#include "mod_device_id/mips_cdmm.h"
+#include "mod_device_id/of.h"
+#include "mod_device_id/parisc.h"
+#include "mod_device_id/pci.h"
+#include "mod_device_id/pcmcia.h"
+#include "mod_device_id/platform.h"
+#include "mod_device_id/pnp.h"
+#include "mod_device_id/rio.h"
+#include "mod_device_id/rpmsg.h"
+#include "mod_device_id/sdio.h"
+#include "mod_device_id/sdw.h"
+#include "mod_device_id/serio.h"
+#include "mod_device_id/slim.h"
+#include "mod_device_id/spi.h"
+#include "mod_device_id/spmi.h"
+#include "mod_device_id/ssam.h"
+#include "mod_device_id/ssb.h"
+#include "mod_device_id/tb.h"
+#include "mod_device_id/tee_client.h"
+#include "mod_device_id/typec.h"
+#include "mod_device_id/ulpi.h"
+#include "mod_device_id/usb.h"
+#include "mod_device_id/vchiq.h"
+#include "mod_device_id/vio.h"
+#include "mod_device_id/virtio.h"
+#include "mod_device_id/wmi.h"
+#include "mod_device_id/x86_cpu.h"
+#include "mod_device_id/zorro.h"
 
 /*
  * Generic table type for matching CPU features.
@@ -719,265 +78,4 @@ struct cpu_feature {
 	__u16	feature;
 };
 
-#define IPACK_ANY_FORMAT 0xff
-#define IPACK_ANY_ID (~0)
-struct ipack_device_id {
-	__u8  format;			/* Format version or IPACK_ANY_ID */
-	__u32 vendor;			/* Vendor ID or IPACK_ANY_ID */
-	__u32 device;			/* Device ID or IPACK_ANY_ID */
-};
-
-#define MEI_CL_MODULE_PREFIX "mei:"
-#define MEI_CL_NAME_SIZE 32
-#define MEI_CL_VERSION_ANY 0xff
-
-/**
- * struct mei_cl_device_id - MEI client device identifier
- * @name: helper name
- * @uuid: client uuid
- * @version: client protocol version
- * @driver_info: information used by the driver.
- *
- * identifies mei client device by uuid and name
- */
-struct mei_cl_device_id {
-	char name[MEI_CL_NAME_SIZE];
-	uuid_le uuid;
-	__u8    version;
-	kernel_ulong_t driver_info;
-};
-
-/* RapidIO */
-
-#define RIO_ANY_ID	0xffff
-
-/**
- * struct rio_device_id - RIO device identifier
- * @did: RapidIO device ID
- * @vid: RapidIO vendor ID
- * @asm_did: RapidIO assembly device ID
- * @asm_vid: RapidIO assembly vendor ID
- *
- * Identifies a RapidIO device based on both the device/vendor IDs and
- * the assembly device/vendor IDs.
- */
-struct rio_device_id {
-	__u16 did, vid;
-	__u16 asm_did, asm_vid;
-};
-
-struct mcb_device_id {
-	__u16 device;
-	kernel_ulong_t driver_data;
-};
-
-struct ulpi_device_id {
-	__u16 vendor;
-	__u16 product;
-	kernel_ulong_t driver_data;
-};
-
-/**
- * struct fsl_mc_device_id - MC object device identifier
- * @vendor: vendor ID
- * @obj_type: MC object type
- *
- * Type of entries in the "device Id" table for MC object devices supported by
- * a MC object device driver. The last entry of the table has vendor set to 0x0
- */
-struct fsl_mc_device_id {
-	__u16 vendor;
-	const char obj_type[16];
-};
-
-/**
- * struct tb_service_id - Thunderbolt service identifiers
- * @match_flags: Flags used to match the structure
- * @protocol_key: Protocol key the service supports
- * @protocol_id: Protocol id the service supports
- * @protocol_version: Version of the protocol
- * @protocol_revision: Revision of the protocol software
- * @driver_data: Driver specific data
- *
- * Thunderbolt XDomain services are exposed as devices where each device
- * carries the protocol information the service supports. Thunderbolt
- * XDomain service drivers match against that information.
- */
-struct tb_service_id {
-	__u32 match_flags;
-	char protocol_key[8 + 1];
-	__u32 protocol_id;
-	__u32 protocol_version;
-	__u32 protocol_revision;
-	kernel_ulong_t driver_data;
-};
-
-#define TBSVC_MATCH_PROTOCOL_KEY	0x0001
-#define TBSVC_MATCH_PROTOCOL_ID		0x0002
-#define TBSVC_MATCH_PROTOCOL_VERSION	0x0004
-#define TBSVC_MATCH_PROTOCOL_REVISION	0x0008
-
-/* USB Type-C Alternate Modes */
-
-#define TYPEC_ANY_MODE	0x7
-
-/**
- * struct typec_device_id - USB Type-C alternate mode identifiers
- * @svid: Standard or Vendor ID
- * @mode: Mode index
- * @driver_data: Driver specific data
- */
-struct typec_device_id {
-	__u16 svid;
-	__u8 mode;
-	kernel_ulong_t driver_data;
-};
-
-/**
- * struct tee_client_device_id - tee based device identifier
- * @uuid: For TEE based client devices we use the device uuid as
- *        the identifier.
- */
-struct tee_client_device_id {
-	uuid_t uuid;
-};
-
-/* WMI */
-
-#define WMI_MODULE_PREFIX	"wmi:"
-
-/**
- * struct wmi_device_id - WMI device identifier
- * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
- * @context: pointer to driver specific data
- */
-struct wmi_device_id {
-	const char guid_string[UUID_STRING_LEN+1];
-	const void *context;
-};
-
-#define MHI_DEVICE_MODALIAS_FMT "mhi:%s"
-#define MHI_NAME_SIZE 32
-
-#define MHI_EP_DEVICE_MODALIAS_FMT "mhi_ep:%s"
-
-/**
- * struct mhi_device_id - MHI device identification
- * @chan: MHI channel name
- * @driver_data: driver data;
- */
-struct mhi_device_id {
-	const char chan[MHI_NAME_SIZE];
-	kernel_ulong_t driver_data;
-};
-
-#define AUXILIARY_NAME_SIZE 40
-#define AUXILIARY_MODULE_PREFIX "auxiliary:"
-
-struct auxiliary_device_id {
-	char name[AUXILIARY_NAME_SIZE];
-	kernel_ulong_t driver_data;
-};
-
-/* Surface System Aggregator Module */
-
-#define SSAM_MATCH_TARGET	0x1
-#define SSAM_MATCH_INSTANCE	0x2
-#define SSAM_MATCH_FUNCTION	0x4
-
-struct ssam_device_id {
-	__u8 match_flags;
-
-	__u8 domain;
-	__u8 category;
-	__u8 target;
-	__u8 instance;
-	__u8 function;
-
-	kernel_ulong_t driver_data;
-};
-
-/*
- * DFL (Device Feature List)
- *
- * DFL defines a linked list of feature headers within the device MMIO space to
- * provide an extensible way of adding features. Software can walk through these
- * predefined data structures to enumerate features. It is now used in the FPGA.
- * See Documentation/fpga/dfl.rst for more information.
- *
- * The dfl bus type is introduced to match the individual feature devices (dfl
- * devices) for specific dfl drivers.
- */
-
-/**
- * struct dfl_device_id -  dfl device identifier
- * @type: DFL FIU type of the device. See enum dfl_id_type.
- * @feature_id: feature identifier local to its DFL FIU type.
- * @driver_data: driver specific data.
- */
-struct dfl_device_id {
-	__u16 type;
-	__u16 feature_id;
-	kernel_ulong_t driver_data;
-};
-
-/* ISHTP (Integrated Sensor Hub Transport Protocol) */
-
-#define ISHTP_MODULE_PREFIX	"ishtp:"
-
-/**
- * struct ishtp_device_id - ISHTP device identifier
- * @guid: GUID of the device.
- * @driver_data: pointer to driver specific data
- */
-struct ishtp_device_id {
-	guid_t guid;
-	kernel_ulong_t driver_data;
-};
-
-#define CDX_ANY_ID (0xFFFF)
-
-enum {
-	CDX_ID_F_VFIO_DRIVER_OVERRIDE = 1,
-};
-
-/**
- * struct cdx_device_id - CDX device identifier
- * @vendor: Vendor ID
- * @device: Device ID
- * @subvendor: Subsystem vendor ID (or CDX_ANY_ID)
- * @subdevice: Subsystem device ID (or CDX_ANY_ID)
- * @class: Device class
- *         Most drivers do not need to specify class/class_mask
- *         as vendor/device is normally sufficient.
- * @class_mask: Limit which sub-fields of the class field are compared.
- * @override_only: Match only when dev->driver_override is this driver.
- *
- * Type of entries in the "device Id" table for CDX devices supported by
- * a CDX device driver.
- */
-struct cdx_device_id {
-	__u16 vendor;
-	__u16 device;
-	__u16 subvendor;
-	__u16 subdevice;
-	__u32 class;
-	__u32 class_mask;
-	__u32 override_only;
-};
-
-struct vchiq_device_id {
-	char name[32];
-};
-
-/**
- * struct coreboot_device_id - Identifies a coreboot table entry
- * @tag: tag ID
- * @driver_data: driver specific data
- */
-struct coreboot_device_id {
-	__u32 tag;
-	kernel_ulong_t driver_data;
-};
-
 #endif /* LINUX_MOD_DEVICETABLE_H */
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 02/17] media: ti: vpe: #include <linux/platform_device.h> explicitly
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  (?)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Yemike Abhilash Chandra, Mauro Carvalho Chehab, linux-media,
	linux-kernel

The driver uses several symbols and structs defined in that header. The
header is currently included transitively via

	"vip.h" ->
	<media/v4l2-ctrls.h> ->
	<media/media-request.h> ->
	<media/media-device.h> ->
	<linux/platform_device.h>

which seems to be on the lower end of the scale between random and
reliable.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 drivers/media/platform/ti/vpe/vip.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/ti/vpe/vip.c b/drivers/media/platform/ti/vpe/vip.c
index cb0a5a07a3d4..e56a95f53ea9 100644
--- a/drivers/media/platform/ti/vpe/vip.c
+++ b/drivers/media/platform/ti/vpe/vip.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/workqueue.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/sched.h>
 #include <linux/mfd/syscon.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 03/17] ASoC: rockchip: rockchip_sai: #include <linux/platform_device.h> explicitly
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
@ 2026-06-26 18:00   ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Nicolas Frattaroli, Liam Girdwood, Mark Brown, Jaroslav Kysela,
	Takashi Iwai, Heiko Stuebner, linux-rockchip, linux-sound,
	linux-arm-kernel, linux-kernel

Currently that header is only included via:

	<sound/dmaengine_pcm.h> ->
	<sound/soc.h> ->
	<linux/platform_device.h>

which doesn't look reliable, still more in the presence of the comment:

	/* For the current users of sound/soc.h to avoid build issues */

in <sound/soc.h>.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 sound/soc/rockchip/rockchip_sai.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/rockchip/rockchip_sai.c b/sound/soc/rockchip/rockchip_sai.c
index a195e96fed0a..37e81d56bc16 100644
--- a/sound/soc/rockchip/rockchip_sai.c
+++ b/sound/soc/rockchip/rockchip_sai.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/of_device.h>
 #include <linux/clk.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 03/17] ASoC: rockchip: rockchip_sai: #include <linux/platform_device.h> explicitly
@ 2026-06-26 18:00   ` Uwe Kleine-König (The Capable Hub)
  0 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Nicolas Frattaroli, Liam Girdwood, Mark Brown, Jaroslav Kysela,
	Takashi Iwai, Heiko Stuebner, linux-rockchip, linux-sound,
	linux-arm-kernel, linux-kernel

Currently that header is only included via:

	<sound/dmaengine_pcm.h> ->
	<sound/soc.h> ->
	<linux/platform_device.h>

which doesn't look reliable, still more in the presence of the comment:

	/* For the current users of sound/soc.h to avoid build issues */

in <sound/soc.h>.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 sound/soc/rockchip/rockchip_sai.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/rockchip/rockchip_sai.c b/sound/soc/rockchip/rockchip_sai.c
index a195e96fed0a..37e81d56bc16 100644
--- a/sound/soc/rockchip/rockchip_sai.c
+++ b/sound/soc/rockchip/rockchip_sai.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/of_device.h>
 #include <linux/clk.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
-- 
2.47.3


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (3 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  2026-06-26 18:30   ` Linus Torvalds
  2026-06-26 18:35   ` Greg Kroah-Hartman
  -1 siblings, 2 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Rafael J. Wysocki, Danilo Krummrich, driver-core, linux-kernel

struct device_driver contains pointers of type struct of_device_id* and
struct acpi_device_id* but doesn't ensure these are defined. To make the
header self-contained add the (very lightweight) includes that contain
the respective definitions.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/linux/device/driver.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h
index 38048e74d10a..5323157571a5 100644
--- a/include/linux/device/driver.h
+++ b/include/linux/device/driver.h
@@ -19,6 +19,8 @@
 #include <linux/pm.h>
 #include <linux/device/bus.h>
 #include <linux/module.h>
+#include <linux/mod_device_id/acpi.h>
+#include <linux/mod_device_id/of.h>
 
 /**
  * enum probe_type - device driver probe type to try
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 05/17] driver core: platform: Include header for struct platform_device_id
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (4 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Danilo Krummrich, Jonathan Cameron, Dmitry Torokhov,
	Bartosz Golaszewski, Pei Xiao, Shashank Balaji, Ben Horgan,
	linux-kernel

Platform drivers can define an array containing the supported device
variants to be assigned to the struct platform_driver's .id_table.

While a forward declaration of struct platform_device_id is technically
enough to make the driver self-contained, it's reasonable to provide the
(very lightweight) data type definition for that array in
<linux/platform_device.h> to not add that burden to all platform drivers
with an id-table.

Note that currently <linux/device.h> transitively includes
<linux/mod_devicetable.h> that provides struct platform_device_id. But
that include is planned to be replaced by a tighter set of includes that
only define the structures relevant for the stuff in <linux/device.h>.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/linux/platform_device.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 26e6a43358e2..dbea670082dc 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -11,6 +11,7 @@
 #define _PLATFORM_DEVICE_H_
 
 #include <linux/device.h>
+#include <linux/mod_device_id/platform.h>
 
 #define PLATFORM_DEVID_NONE	(-1)
 #define PLATFORM_DEVID_AUTO	(-2)
@@ -18,7 +19,6 @@
 struct irq_affinity;
 struct mfd_cell;
 struct property_entry;
-struct platform_device_id;
 
 struct platform_device {
 	const char	*name;
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 06/17] usb: serial: Include <linux/usb.h> in <linux/usb/serial.h>
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (5 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman; +Cc: Johan Hovold, linux-usb, linux-kernel

All consumers of the latter also include the former, but without that
struct usb_driver and struct usb_device_id (and maybe more) are not
defined. Add an include for <linux/usb.h> to make the header
self-contained.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/linux/usb/serial.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 75b2b763f1ba..534e6650e2aa 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -13,6 +13,7 @@
 #include <linux/mutex.h>
 #include <linux/serial.h>
 #include <linux/kfifo.h>
+#include <linux/usb.h>
 
 /* The maximum number of ports one device can grab at once */
 #define MAX_NUM_PORTS		16
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 07/17] platform/x86: msi-ec: Ensure dmi_system_id is defined
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (6 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Nikita Kravets, Hans de Goede, Ilpo Järvinen,
	platform-driver-x86, linux-kernel

Currently <linux/acpi.h> includes <linux/mod_devicetable.h> and thus
dmi_system_id is available for the driver. To disentangle includes
<linux/acpi.h> will be changed to only include the header for
acpi_device_id instead of the full <linux/mod_devicetable.h>. To prepare
for that include the dedicated header for struct dmi_device_id.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 drivers/platform/x86/msi-ec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/platform/x86/msi-ec.c b/drivers/platform/x86/msi-ec.c
index f19504dbf164..ccc7c7e467b5 100644
--- a/drivers/platform/x86/msi-ec.c
+++ b/drivers/platform/x86/msi-ec.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/mod_device_id/dmi.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
 #include <linux/string.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 08/17] of: Explicitly include <linux/types.h> and <linux/err.h>
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (7 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Rob Herring, Saravana Kannan, devicetree, linux-kernel

<linux/of_platform.h> uses resource_size_t and relies on the transitive
include <linux/mod_devicetable.h> -> <linux/types.h>. It also uses error
constants and thus relying on the include chain
<linux/mod_devicetable.h> -> <linux/uuid.h> -> <linux/string.h> ->
<linux/err.h>.

With the plan to split <linux/mod_devicetable.h> per subsystem and then
only letting of_platform.h include the of-specific bits (which don't
require these two headers), add the needed includes explicitly to keep
the header self-contained.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/linux/of_platform.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 17471ef8e092..48f73af88dd7 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -6,6 +6,8 @@
  *			 <benh@kernel.crashing.org>
  */
 
+#include <linux/types.h>
+#include <linux/err.h>
 #include <linux/mod_devicetable.h>
 
 struct device;
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 09/17] i2c: Let i2c-core.h include <linux/i2c.h>
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (8 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman; +Cc: Andi Shyti, linux-i2c, linux-kernel

The subsystem private header i2c-core.h uses several symbols defined in
<linux/i2c.h>, e.g. struct i2c_board_info and i2c_lock_bus()). This
doesn't pose a problem in practise because all files including
"i2c-core.h" also include <linux/i2c.h>.

To make this more robust add an include statement for <linux/i2c.h>
making the header self-contained.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 drivers/i2c/i2c-core.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index 4797ba88331c..c519da536647 100644
--- a/drivers/i2c/i2c-core.h
+++ b/drivers/i2c/i2c-core.h
@@ -3,6 +3,7 @@
  * i2c-core.h - interfaces internal to the I2C framework
  */
 
+#include <linux/i2c.h>
 #include <linux/kconfig.h>
 #include <linux/rwsem.h>
 
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 10/17] platform/x86: x86-android-tablets: Add include defining struct dmi_system_id
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (9 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Hans de Goede, Ilpo Järvinen, platform-driver-x86,
	linux-kernel

Currently <linux/i2c.h> includes <linux/mod_devicetable.h> transitively
which ensures that struct dmi_system_id is defined in
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h. However
this include in <linux/i2c.h> will be replaced by one for i2c_device_id
only. To ensure that dmi_system_id is available add the include for that
explicitly.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 drivers/platform/x86/x86-android-tablets/x86-android-tablets.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/platform/x86/x86-android-tablets/x86-android-tablets.h b/drivers/platform/x86/x86-android-tablets/x86-android-tablets.h
index 2498390958ad..25298a430796 100644
--- a/drivers/platform/x86/x86-android-tablets/x86-android-tablets.h
+++ b/drivers/platform/x86/x86-android-tablets/x86-android-tablets.h
@@ -13,6 +13,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/irqdomain_defs.h>
+#include <linux/mod_device_id/dmi.h>
 #include <linux/spi/spi.h>
 
 struct gpio_desc;
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 11/17] platform/x86: int3472: Add include defining struct dmi_system_id
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (10 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Daniel Scally, Sakari Ailus, Hans de Goede, Ilpo Järvinen,
	platform-driver-x86, linux-kernel

Currently <linux/mod_devicetable.h> is included transitively in
int3472.h via

	<linux/clk-provider.h> ->
	<linux/of.h> ->
	<linux/mod_devicetable.h>

However these includes will be tightend such that only the bits relevant
for of will be provided by <linux/of.h>. To ensure that dmi_system_id
stays around, include the respective header explicitly.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/linux/platform_data/x86/int3472.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/platform_data/x86/int3472.h b/include/linux/platform_data/x86/int3472.h
index 93f1e1fe09b4..f570e3266a2a 100644
--- a/include/linux/platform_data/x86/int3472.h
+++ b/include/linux/platform_data/x86/int3472.h
@@ -13,6 +13,7 @@
 #include <linux/leds.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#include <linux/mod_device_id/dmi.h>
 #include <linux/types.h>
 
 /* FIXME drop this once the I2C_DEV_NAME_FORMAT macro has been added to include/linux/i2c.h */
@@ -72,7 +73,6 @@
 	container_of(clk, struct int3472_discrete_device, clock)
 
 struct acpi_device;
-struct dmi_system_id;
 struct i2c_client;
 struct platform_device;
 
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 12/17] usb: dwc2: Add include defining struct pci_device_id
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (11 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  2026-06-26 18:23   ` Greg Kroah-Hartman
  -1 siblings, 1 reply; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Minas Harutyunyan, linux-usb, linux-kernel

Up to now <linux/acpi.h> includes <linux/mod_devicetable.h> that
provides struct pci_device_id. However <linux/mod_devicetable.h> was
split into per bus headers and <linux/acpi.h> will only include the acpi
related one (and similar for other bus headers).

As struct pci_device_id is used in drivers/usb/dwc2/core.h, add an
include to ensure it's defined also after the includes in <linux/acpi.h>
are tightened.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 drivers/usb/dwc2/core.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 34127b890b2a..68738fe173ed 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -9,6 +9,7 @@
 #define __DWC2_CORE_H__
 
 #include <linux/acpi.h>
+#include <linux/mod_device_id/pci.h>
 #include <linux/phy/phy.h>
 #include <linux/regulator/consumer.h>
 #include <linux/usb/gadget.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 13/17] ALSA: hda/core: Add include defining struct hda_device_id
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (12 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Jaroslav Kysela, Takashi Iwai, linux-sound, linux-kernel

Traditionally all *_device_id were defined in a single header
<linux/mod_devicetable.h>. This was split now with the objective that
only the relevant bits are included. So including <linux/pci.h> won't be
enough to get a definition of (the unrelated to pci) struct
hda_device_id.

Add an explicit include for the header defining struct hda_device_id to
keep working when <linux/pci.h> stops providing this defintion.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 include/sound/hdaudio.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index f11bfc6b9f42..e268ff9e9aa0 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -11,6 +11,7 @@
 #include <linux/io.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/iopoll.h>
+#include <linux/mod_device_id/hda.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/timecounter.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 14/17] LoongArch: KVM: Add include defining struct cpu_feature
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (13 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Tianrui Zhao, Bibo Mao, Huacai Chen, WANG Xuerui, kvm, loongarch,
	linux-kernel

Traditionally <linux/mod_devicetable.h> was a header defining a plethora
of structs, among them struct cpu_features. This was split now with the
objective that only the relevant bits are included.

Currently <linux/mod_devicetable.h> is transitively included in
arch/loongarch/kvm/main.c via:

	arch/loongarch/kvm/main.c ->
	<linux/kvm_host.h> ->
	<linux/entry-virt.h> ->
	<linux/resume_user_mode.h> ->
	<linux/memcontrol.h> ->
	<linux/cgroup.h> ->
	<linux/kernel_stat.h> ->
	<linux/interrupt.h> ->
	<linux/hardirq> ->
	<asm/hardirq.h> ->
	<linux/irq.h> ->
	<asm/irq.h> ->
	<linux/irqdomain.h> ->
	<linux/of.h> ->
	<linux/mod_devicetable.h>

To keep struct cpu_features available once <linux/of.h> stops including
<linux/mod_devicetable.h>, include it here explicitly.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 arch/loongarch/kvm/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/loongarch/kvm/main.c b/arch/loongarch/kvm/main.c
index f105a86143f5..aa0fb4c90d90 100644
--- a/arch/loongarch/kvm/main.c
+++ b/arch/loongarch/kvm/main.c
@@ -5,6 +5,7 @@
 
 #include <linux/err.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h> /* for struct cpu_feature */
 #include <linux/kvm_host.h>
 #include <asm/cacheflush.h>
 #include <asm/cpufeature.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 15/17] media: em28xx: Add include for struct usb_device_id
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (14 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman
  Cc: Mauro Carvalho Chehab, linux-media, linux-kernel

Traditionally <linux/mod_devicetable.h> was a header defining a plethora
of structs, among them struct usb_device_id. This was split now with the
objective that only the relevant bits are included.

Currently <linux/mod_devicetable.h> is transitively included in
drivers/media/usb/em28xx/em28xx.h via:

	drivers/media/usb/em28xx/em28xx.h ->
	<linux/i2c.h> ->
	<linux/acpi.h> ->
	<linux/device.h> ->
	<linux/device/driver.h> ->
	<linux/mod_devicetable.h

To keep struct usb_device_id available once <linux/device/driver.h>
stops including <linux/mod_devicetable.h>, include it the header
providing that struct explictly.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 drivers/media/usb/em28xx/em28xx.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 21c912403efc..78efebbcb9cc 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -23,6 +23,7 @@
 #include <linux/mutex.h>
 #include <linux/kref.h>
 #include <linux/videodev2.h>
+#include <linux/mod_device_id/usb.h>
 
 #include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 16/17] Replace <linux/mod_devicetable.h> by more specific <linux/mod_device_id/*.h> (headers)
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (15 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman, Mark Brown
  Cc: Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	Raag Jadav, Sohil Mehta, Dave Hansen, Rob Herring,
	Saravana Kannan, Bjorn Helgaas, Rafael J. Wysocki, Len Brown,
	Andi Shyti, linux-kernel

<linux/mod_devicetable.h> is included in a many files:

	$ git grep '<linux/mod_devicetable.h>' ef0c9f75a195 | wc -l
	1598

; some of them are widely used headers. To stop mixing up different and
unrelated driver( type)s let the subsystem headers only use the subset
of the recently split <linux/mod_devicetable.h> that are relevant for
them.

The fallout (I hope) is addressed in the previous commits that handle
sources relying on e.g. <linux/i2c.h> pulling in the full legacy header
and thus providing pci_device_id.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 arch/mips/include/asm/cdmm.h              | 2 +-
 arch/parisc/include/asm/hardware.h        | 4 +---
 arch/parisc/include/asm/parisc-device.h   | 1 +
 arch/s390/include/asm/ccwdev.h            | 2 +-
 arch/x86/include/asm/cpu_device_id.h      | 5 +----
 drivers/hid/intel-ish-hid/ishtp/bus.h     | 2 +-
 include/linux/acpi.h                      | 2 +-
 include/linux/amba/bus.h                  | 2 +-
 include/linux/auxiliary_bus.h             | 2 +-
 include/linux/bcma/bcma.h                 | 2 +-
 include/linux/cdx/cdx_bus.h               | 2 +-
 include/linux/dfl.h                       | 2 +-
 include/linux/dmi.h                       | 2 +-
 include/linux/eisa.h                      | 2 +-
 include/linux/firewire.h                  | 3 +--
 include/linux/fsl/mc.h                    | 2 +-
 include/linux/hid.h                       | 2 +-
 include/linux/hyperv.h                    | 2 +-
 include/linux/i2c.h                       | 2 +-
 include/linux/i3c/device.h                | 2 +-
 include/linux/input.h                     | 2 +-
 include/linux/intel-ish-client-if.h       | 2 +-
 include/linux/ipack.h                     | 2 +-
 include/linux/isapnp.h                    | 2 +-
 include/linux/mcb.h                       | 2 +-
 include/linux/mei_cl_bus.h                | 2 +-
 include/linux/mhi.h                       | 1 +
 include/linux/mmc/sdio_func.h             | 2 +-
 include/linux/of.h                        | 2 +-
 include/linux/of_platform.h               | 2 +-
 include/linux/pci-epf.h                   | 2 +-
 include/linux/pci.h                       | 2 +-
 include/linux/phy.h                       | 2 +-
 include/linux/platform_data/x86/soc.h     | 2 +-
 include/linux/pnp.h                       | 2 +-
 include/linux/raspberrypi/vchiq_bus.h     | 2 +-
 include/linux/rio.h                       | 2 +-
 include/linux/rpmsg.h                     | 2 +-
 include/linux/serio.h                     | 2 +-
 include/linux/slimbus.h                   | 2 +-
 include/linux/soc/qcom/apr.h              | 2 +-
 include/linux/soundwire/sdw.h             | 2 +-
 include/linux/spi/spi.h                   | 4 +++-
 include/linux/ssb/ssb.h                   | 2 +-
 include/linux/surface_aggregator/device.h | 2 +-
 include/linux/tee_drv.h                   | 2 +-
 include/linux/thunderbolt.h               | 2 +-
 include/linux/ulpi/driver.h               | 2 +-
 include/linux/usb.h                       | 2 +-
 include/linux/usb/typec_altmode.h         | 2 +-
 include/linux/virtio.h                    | 2 +-
 include/linux/wmi.h                       | 2 +-
 include/linux/zorro.h                     | 2 +-
 include/pcmcia/ds.h                       | 2 +-
 include/sound/hda_codec.h                 | 2 +-
 55 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/arch/mips/include/asm/cdmm.h b/arch/mips/include/asm/cdmm.h
index 81fa99084178..404de1853ff6 100644
--- a/arch/mips/include/asm/cdmm.h
+++ b/arch/mips/include/asm/cdmm.h
@@ -9,7 +9,7 @@
 #define __ASM_CDMM_H
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/mips_cdmm.h>
 
 /**
  * struct mips_cdmm_device - Represents a single device on a CDMM bus.
diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/asm/hardware.h
index a005ebc54779..7eb83d79d4d0 100644
--- a/arch/parisc/include/asm/hardware.h
+++ b/arch/parisc/include/asm/hardware.h
@@ -2,7 +2,7 @@
 #ifndef _PARISC_HARDWARE_H
 #define _PARISC_HARDWARE_H
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/parisc.h>
 
 #define HWTYPE_ANY_ID		PA_HWTYPE_ANY_ID
 #define HVERSION_ANY_ID		PA_HVERSION_ANY_ID
@@ -95,8 +95,6 @@ struct bc_module {
 #define HPHW_MC	       15
 #define HPHW_FAULTY    31
 
-struct parisc_device_id;
-
 /* hardware.c: */
 extern const char *parisc_hardware_description(struct parisc_device_id *id);
 extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);
diff --git a/arch/parisc/include/asm/parisc-device.h b/arch/parisc/include/asm/parisc-device.h
index 9e74cef4d774..2642cb685423 100644
--- a/arch/parisc/include/asm/parisc-device.h
+++ b/arch/parisc/include/asm/parisc-device.h
@@ -3,6 +3,7 @@
 #define _ASM_PARISC_PARISC_DEVICE_H_
 
 #include <linux/device.h>
+#include <linux/mod_device_id/parisc.h>
 
 struct parisc_device {
 	struct resource hpa;		/* Hard Physical Address */
diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index e3afcece375e..614f6788ed44 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -10,7 +10,7 @@
 #define _S390_CCWDEV_H_
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ccw.h>
 #include <asm/chsc.h>
 #include <asm/fcx.h>
 #include <asm/irq.h>
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index 6be777a06944..1d477886f597 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -38,11 +38,8 @@
 /*
  * Declare drivers belonging to specific x86 CPUs
  * Similar in spirit to pci_device_id and related PCI functions
- *
- * The wildcard initializers are in mod_devicetable.h because
- * file2alias needs them. Sigh.
  */
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/x86_cpu.h>
 /* Get the INTEL_FAM* model defines */
 #include <asm/intel-family.h>
 /* And the X86_VENDOR_* ones */
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.h b/drivers/hid/intel-ish-hid/ishtp/bus.h
index 53645ac89ee8..ffe9f78fec46 100644
--- a/drivers/hid/intel-ish-hid/ishtp/bus.h
+++ b/drivers/hid/intel-ish-hid/ishtp/bus.h
@@ -8,7 +8,7 @@
 #define _LINUX_ISHTP_CL_BUS_H
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ishtp.h>
 #include <linux/intel-ish-client-if.h>
 
 struct ishtp_cl;
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 67effb91fa98..2095e12d4331 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -13,7 +13,7 @@
 #include <linux/ioport.h>	/* for struct resource */
 #include <linux/resource_ext.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/acpi.h>
 #include <linux/property.h>
 #include <linux/uuid.h>
 #include <linux/node.h>
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 6c54d5c0d21f..e851dd1e9b49 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -13,7 +13,7 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/amba.h>
 #include <linux/err.h>
 #include <linux/resource.h>
 #include <linux/regulator/consumer.h>
diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h
index 4e1ad8ccbcdd..fca41a9d2814 100644
--- a/include/linux/auxiliary_bus.h
+++ b/include/linux/auxiliary_bus.h
@@ -9,7 +9,7 @@
 #define _AUXILIARY_BUS_H_
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/auxiliary.h>
 
 /**
  * DOC: DEVICE_LIFESPAN
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 60b94b944e9f..aa618aa7f133 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -3,7 +3,7 @@
 #define LINUX_BCMA_H_
 
 #include <linux/pci.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/bcma.h>
 
 #include <linux/bcma/bcma_driver_arm_c9.h>
 #include <linux/bcma/bcma_driver_chipcommon.h>
diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h
index f54770f110bc..699c51ae1249 100644
--- a/include/linux/cdx/cdx_bus.h
+++ b/include/linux/cdx/cdx_bus.h
@@ -11,7 +11,7 @@
 
 #include <linux/device.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/cdx.h>
 #include <linux/msi.h>
 
 #define MAX_CDX_DEV_RESOURCES	4
diff --git a/include/linux/dfl.h b/include/linux/dfl.h
index 1f02db0c1897..f8a88cb23bc0 100644
--- a/include/linux/dfl.h
+++ b/include/linux/dfl.h
@@ -9,7 +9,7 @@
 #define __LINUX_DFL_H
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/dfl.h>
 
 /**
  * enum dfl_id_type - define the DFL FIU types
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index c8700e6a694d..00419a005e3a 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -4,7 +4,7 @@
 
 #include <linux/list.h>
 #include <linux/kobject.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/dmi.h>
 
 /* enum dmi_field is in mod_devicetable.h */
 
diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index cf55630b595b..71d33718aaa3 100644
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -4,7 +4,7 @@
 
 #include <linux/ioport.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/eisa.h>
 
 #define EISA_MAX_SLOTS 8
 
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 986d712e4d94..7011de89130a 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -14,6 +14,7 @@
 #include <linux/timer.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
+#include <linux/mod_device_id/ieee1394.h>
 
 #include <linux/atomic.h>
 #include <asm/byteorder.h>
@@ -271,8 +272,6 @@ static inline void fw_unit_put(struct fw_unit *unit)
 
 #define fw_parent_device(unit)	fw_device(unit->device.parent)
 
-struct ieee1394_device_id;
-
 struct fw_driver {
 	struct device_driver driver;
 	int (*probe)(struct fw_unit *unit, const struct ieee1394_device_id *id);
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index 9f671e87c80c..dba99fbd3145 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -11,7 +11,7 @@
 #define _FSL_MC_H_
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/fsl_mc.h>
 #include <linux/interrupt.h>
 #include <uapi/linux/fsl_mc.h>
 
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 47dc0bc89fa4..84ba38f0a93e 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -18,7 +18,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h> /* hid_device_id */
+#include <linux/mod_device_id/hid.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 #include <linux/input.h>
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 9de2c8d6037a..32572a33b6ee 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -21,7 +21,7 @@
 #include <linux/timer.h>
 #include <linux/completion.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/hv_vmbus.h>
 #include <linux/interrupt.h>
 #include <linux/reciprocal_div.h>
 #include <hyperv/hvhdk.h>
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 20fd41b51d5c..798d3f725bab 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -12,7 +12,7 @@
 
 #include <linux/acpi.h>		/* for acpi_handle */
 #include <linux/bits.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/i2c.h>
 #include <linux/device.h>	/* for struct device */
 #include <linux/sched.h>	/* for completion */
 #include <linux/mutex.h>
diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h
index 971d53349b6f..64e2ea4734b0 100644
--- a/include/linux/i3c/device.h
+++ b/include/linux/i3c/device.h
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/kconfig.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/i3c.h>
 #include <linux/module.h>
 
 /**
diff --git a/include/linux/input.h b/include/linux/input.h
index 06ca62328db1..99a0365e52e1 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -19,7 +19,7 @@
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/timer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/input.h>
 
 struct input_dev_poller;
 
diff --git a/include/linux/intel-ish-client-if.h b/include/linux/intel-ish-client-if.h
index 2cd4f65aaa37..2bfe6cfddd52 100644
--- a/include/linux/intel-ish-client-if.h
+++ b/include/linux/intel-ish-client-if.h
@@ -9,7 +9,7 @@
 #define _INTEL_ISH_CLIENT_IF_H_
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ishtp.h>
 
 struct ishtp_cl_device;
 struct ishtp_device;
diff --git a/include/linux/ipack.h b/include/linux/ipack.h
index 455f6c2a1903..591b39da2b78 100644
--- a/include/linux/ipack.h
+++ b/include/linux/ipack.h
@@ -6,7 +6,7 @@
  * Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
  */
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ipack.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
 
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h
index dba18c95844b..8bc604191cc0 100644
--- a/include/linux/isapnp.h
+++ b/include/linux/isapnp.h
@@ -28,7 +28,7 @@
  */
 
 #ifdef __KERNEL__
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/isapnp.h>
 
 #define DEVICE_COUNT_COMPATIBLE 4
 
diff --git a/include/linux/mcb.h b/include/linux/mcb.h
index 4ab2691f51a6..085cde737dd1 100644
--- a/include/linux/mcb.h
+++ b/include/linux/mcb.h
@@ -8,7 +8,7 @@
 #ifndef _LINUX_MCB_H
 #define _LINUX_MCB_H
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/mcb.h>
 #include <linux/device.h>
 #include <linux/irqreturn.h>
 
diff --git a/include/linux/mei_cl_bus.h b/include/linux/mei_cl_bus.h
index 5bdbd9e1d460..92d1bfc1691f 100644
--- a/include/linux/mei_cl_bus.h
+++ b/include/linux/mei_cl_bus.h
@@ -7,7 +7,7 @@
 
 #include <linux/device.h>
 #include <linux/uuid.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/mei_cl.h>
 
 struct mei_cl_device;
 struct mei_device;
diff --git a/include/linux/mhi.h b/include/linux/mhi.h
index fb3ba639f4f8..9e9bde2ae490 100644
--- a/include/linux/mhi.h
+++ b/include/linux/mhi.h
@@ -14,6 +14,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <linux/mod_device_id/mhi.h>
 
 #define MHI_MAX_OEM_PK_HASH_SEGMENTS 16
 
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 4534bf462aac..1c1d87ea9613 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -9,7 +9,7 @@
 #define LINUX_MMC_SDIO_FUNC_H
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/sdio.h>
 
 #include <linux/mmc/pm.h>
 
diff --git a/include/linux/of.h b/include/linux/of.h
index 20e4f752d5b6..0d8a015176ac 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -16,7 +16,7 @@
 #include <linux/cleanup.h>
 #include <linux/errno.h>
 #include <linux/kobject.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/property.h>
 #include <linux/list.h>
 
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 48f73af88dd7..d982c4e5964f 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -8,7 +8,7 @@
 
 #include <linux/types.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 
 struct device;
 struct device_node;
diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h
index 7737a7c03260..ac41a2e19cd7 100644
--- a/include/linux/pci-epf.h
+++ b/include/linux/pci-epf.h
@@ -11,7 +11,7 @@
 
 #include <linux/configfs.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/pci.h>
 #include <linux/msi.h>
 #include <linux/pci.h>
 
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 2c4454583c11..b8876519e500 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -24,7 +24,7 @@
 #define LINUX_PCI_H
 
 #include <linux/args.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/pci.h>
 
 #include <linux/types.h>
 #include <linux/init.h>
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 199a7aaa341b..66c339c645a8 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/mdio.h>
 #include <linux/u64_stats_sync.h>
 #include <linux/irqreturn.h>
 #include <linux/iopoll.h>
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h
index f981907a5cb0..615f83d0557c 100644
--- a/include/linux/platform_data/x86/soc.h
+++ b/include/linux/platform_data/x86/soc.h
@@ -12,7 +12,7 @@
 
 #if IS_ENABLED(CONFIG_X86)
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/x86_cpu.h>
 
 #include <asm/cpu_device_id.h>
 
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 23fe3eaf242d..e496892c56b0 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/errno.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/pnp.h>
 #include <linux/console.h>
 
 #define PNP_NAME_LEN		50
diff --git a/include/linux/raspberrypi/vchiq_bus.h b/include/linux/raspberrypi/vchiq_bus.h
index 9de179b39f85..4b38668e9332 100644
--- a/include/linux/raspberrypi/vchiq_bus.h
+++ b/include/linux/raspberrypi/vchiq_bus.h
@@ -7,7 +7,7 @@
 #define _VCHIQ_DEVICE_H
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/vchiq.h>
 
 struct vchiq_drv_mgmt;
 
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 2c29f21ba9e5..8ca10249ff27 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <linux/device.h>
 #include <linux/rio_regs.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/rio.h>
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
 #include <linux/dmaengine.h>
 #endif
diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h
index 2e40eb54155e..244feaa06bfd 100644
--- a/include/linux/rpmsg.h
+++ b/include/linux/rpmsg.h
@@ -13,7 +13,7 @@
 #include <linux/types.h>
 #include <linux/device.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/rpmsg.h>
 #include <linux/kref.h>
 #include <linux/mutex.h>
 #include <linux/poll.h>
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 69a47674af65..ccd7c52efb7e 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -13,7 +13,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/serio.h>
 #include <uapi/linux/serio.h>
 
 extern const struct bus_type serio_bus;
diff --git a/include/linux/slimbus.h b/include/linux/slimbus.h
index a4608d9a9684..07d0b76f2806 100644
--- a/include/linux/slimbus.h
+++ b/include/linux/slimbus.h
@@ -8,7 +8,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/completion.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/slim.h>
 
 extern const struct bus_type slimbus_bus;
 
diff --git a/include/linux/soc/qcom/apr.h b/include/linux/soc/qcom/apr.h
index 58fa1df96347..aaf47b4c9e31 100644
--- a/include/linux/soc/qcom/apr.h
+++ b/include/linux/soc/qcom/apr.h
@@ -5,7 +5,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/apr.h>
 #include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/soc/qcom,gpr.h>
 
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index a46cbaec5949..86014f0e3434 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -12,7 +12,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/lockdep_types.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/sdw.h>
 #include <linux/mutex.h>
 #include <linux/types.h>
 #include <sound/sdca.h>
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index f6ed93eff00b..7417735bb01d 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -12,7 +12,9 @@
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kthread.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/acpi.h>
+#include <linux/mod_device_id/of.h>
+#include <linux/mod_device_id/spi.h>
 #include <linux/overflow.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index e1fb11e0f12c..1807585dfa2c 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -8,7 +8,7 @@
 #include <linux/spinlock.h>
 #include <linux/pci.h>
 #include <linux/gpio/driver.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ssb.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 
diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h
index 8cd8c38cf3f3..b2ec14a3124a 100644
--- a/include/linux/surface_aggregator/device.h
+++ b/include/linux/surface_aggregator/device.h
@@ -14,7 +14,7 @@
 #define _LINUX_SURFACE_AGGREGATOR_DEVICE_H
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ssam.h>
 #include <linux/property.h>
 #include <linux/types.h>
 
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
index e561a26f537a..d0f6ff9dd843 100644
--- a/include/linux/tee_drv.h
+++ b/include/linux/tee_drv.h
@@ -9,7 +9,7 @@
 #include <linux/device.h>
 #include <linux/kref.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/tee_client.h>
 #include <linux/tee.h>
 #include <linux/types.h>
 
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index 0ba112175bb3..af7627d227b3 100644
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -22,7 +22,7 @@ struct device;
 #include <linux/idr.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/tb.h>
 #include <linux/pci.h>
 #include <linux/uuid.h>
 #include <linux/workqueue.h>
diff --git a/include/linux/ulpi/driver.h b/include/linux/ulpi/driver.h
index a8cb617a3028..7e24ad80ff70 100644
--- a/include/linux/ulpi/driver.h
+++ b/include/linux/ulpi/driver.h
@@ -2,7 +2,7 @@
 #ifndef __LINUX_ULPI_DRIVER_H
 #define __LINUX_ULPI_DRIVER_H
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ulpi.h>
 
 #include <linux/device.h>
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 25a203ac7a7e..dfcad4bb6745 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -2,7 +2,7 @@
 #ifndef __LINUX_USB_H
 #define __LINUX_USB_H
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/usb.h>
 #include <linux/usb/ch9.h>
 
 #define USB_MAJOR			180
diff --git a/include/linux/usb/typec_altmode.h b/include/linux/usb/typec_altmode.h
index b90cc5cfff8d..1eaf3a58c1ac 100644
--- a/include/linux/usb/typec_altmode.h
+++ b/include/linux/usb/typec_altmode.h
@@ -3,7 +3,7 @@
 #ifndef __USB_TYPEC_ALTMODE_H
 #define __USB_TYPEC_ALTMODE_H
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/typec.h>
 #include <linux/usb/typec.h>
 #include <linux/device.h>
 
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index bf089e51970e..ed9076df9d12 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -7,7 +7,7 @@
 #include <linux/scatterlist.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/virtio.h>
 #include <linux/gfp.h>
 #include <linux/dma-mapping.h>
 #include <linux/completion.h>
diff --git a/include/linux/wmi.h b/include/linux/wmi.h
index d723e4b1cafb..da7dc695438f 100644
--- a/include/linux/wmi.h
+++ b/include/linux/wmi.h
@@ -11,7 +11,7 @@
 #include <linux/compiler_attributes.h>
 #include <linux/device.h>
 #include <linux/acpi.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/wmi.h>
 #include <linux/types.h>
 
 /**
diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index f36c8d39553d..7534ea52f43a 100644
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -17,7 +17,7 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/zorro.h>
 
 #include <asm/zorro.h>
 
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index b7a8de88b3c0..17a4e2e3ddb5 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -14,7 +14,7 @@
 #define _LINUX_DS_H
 
 #ifdef __KERNEL__
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/pcmcia.h>
 #endif
 
 #include <pcmcia/device_id.h>
diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h
index 17945ab5e6e2..d357c828df91 100644
--- a/include/sound/hda_codec.h
+++ b/include/sound/hda_codec.h
@@ -9,7 +9,7 @@
 #define __SOUND_HDA_CODEC_H
 
 #include <linux/refcount.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/hda.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH v2 17/17] Replace <linux/mod_devicetable.h> by more specific <linux/mod_device_id/*.h> (c files)
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
                   ` (16 preceding siblings ...)
  (?)
@ 2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
  -1 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-26 18:00 UTC (permalink / raw)
  To: Linus Torvalds, Greg Kroah-Hartman, Mark Brown
  Cc: Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
	Raag Jadav, Sohil Mehta, Dave Hansen, Rob Herring,
	Saravana Kannan, Bjorn Helgaas, Rafael J. Wysocki, Len Brown,
	Andi Shyti, linux-kernel

Replace the #include of <linux/mod_devicetable.h> by the more specific
<linux/mod_device_id/*.h> where applicable. For most cases the include
can be dropped completely, only a few drivers need one or two headers
added.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
 arch/arm/mach-omap2/board-generic.c                           | 1 -
 arch/loongarch/kvm/main.c                                     | 2 +-
 arch/mips/lantiq/xway/dcdc.c                                  | 1 -
 arch/mips/lantiq/xway/gptu.c                                  | 1 -
 arch/mips/lantiq/xway/vmmc.c                                  | 1 -
 arch/mips/pci/pci-rt2880.c                                    | 1 -
 arch/mips/ralink/timer.c                                      | 1 -
 arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c                | 1 -
 arch/powerpc/platforms/86xx/common.c                          | 1 -
 arch/powerpc/sysdev/fsl_lbc.c                                 | 1 -
 arch/powerpc/sysdev/fsl_pmc.c                                 | 1 -
 arch/sh/drivers/platform_early.c                              | 2 +-
 arch/sparc/crypto/crop_devid.c                                | 2 +-
 arch/sparc/kernel/of_device_32.c                              | 1 -
 arch/sparc/kernel/of_device_64.c                              | 1 -
 arch/sparc/kernel/of_device_common.c                          | 1 -
 arch/x86/kvm/svm/svm.c                                        | 1 -
 arch/x86/kvm/vmx/vmx.c                                        | 1 -
 drivers/accel/ethosu/ethosu_drv.c                             | 1 -
 drivers/accel/qaic/qaic_timesync.c                            | 1 -
 drivers/accel/qaic/sahara.c                                   | 1 -
 drivers/ata/ahci_platform.c                                   | 1 -
 drivers/ata/ahci_sunxi.c                                      | 1 -
 drivers/ata/pata_buddha.c                                     | 1 -
 drivers/ata/pata_ep93xx.c                                     | 1 -
 drivers/ata/pata_imx.c                                        | 1 -
 drivers/auxdisplay/arm-charlcd.c                              | 1 -
 drivers/auxdisplay/hd44780.c                                  | 1 -
 drivers/auxdisplay/lcd2s.c                                    | 1 -
 drivers/auxdisplay/max6959.c                                  | 1 -
 drivers/auxdisplay/seg-led-gpio.c                             | 1 -
 drivers/block/floppy.c                                        | 2 +-
 drivers/bluetooth/hci_h5.c                                    | 1 -
 drivers/bluetooth/hci_qca.c                                   | 1 -
 drivers/bus/mhi/ep/main.c                                     | 1 -
 drivers/bus/mhi/host/init.c                                   | 1 -
 drivers/cache/hisi_soc_hha.c                                  | 1 -
 drivers/cdx/controller/cdx_controller.c                       | 1 -
 drivers/char/hw_random/airoha-trng.c                          | 1 -
 drivers/char/hw_random/atmel-rng.c                            | 1 -
 drivers/char/hw_random/ba431-rng.c                            | 1 -
 drivers/char/hw_random/bcm74110-rng.c                         | 1 -
 drivers/char/hw_random/exynos-trng.c                          | 1 -
 drivers/char/hw_random/histb-rng.c                            | 1 -
 drivers/char/hw_random/imx-rngc.c                             | 1 -
 drivers/char/hw_random/ingenic-trng.c                         | 1 -
 drivers/char/hw_random/iproc-rng200.c                         | 1 -
 drivers/char/hw_random/pasemi-rng.c                           | 1 -
 drivers/char/hw_random/pic32-rng.c                            | 1 -
 drivers/char/hw_random/powernv-rng.c                          | 1 -
 drivers/char/hw_random/xgene-rng.c                            | 1 -
 drivers/char/hw_random/xilinx-trng.c                          | 1 -
 drivers/char/hw_random/xiphera-trng.c                         | 1 -
 drivers/clk/aspeed/clk-ast2600.c                              | 1 -
 drivers/clk/aspeed/clk-ast2700.c                              | 1 -
 drivers/clk/clk-axi-clkgen.c                                  | 1 -
 drivers/clk/clk-bm1880.c                                      | 1 -
 drivers/clk/clk-cdce706.c                                     | 1 -
 drivers/clk/clk-eyeq.c                                        | 1 -
 drivers/clk/clk-renesas-pcie.c                                | 1 -
 drivers/clk/clk-si521xx.c                                     | 1 -
 drivers/clk/clk-versaclock5.c                                 | 1 -
 drivers/clk/imx/clk-imx8mp-audiomix.c                         | 1 -
 drivers/clk/mediatek/clk-mt2701-g3d.c                         | 1 -
 drivers/clk/mediatek/clk-mt2701.c                             | 1 -
 drivers/clk/mediatek/clk-mt2712.c                             | 1 -
 drivers/clk/mediatek/clk-mt6765.c                             | 1 -
 drivers/clk/mediatek/clk-mt6779-aud.c                         | 1 -
 drivers/clk/mediatek/clk-mt7622-eth.c                         | 1 -
 drivers/clk/mediatek/clk-mt7622-hif.c                         | 1 -
 drivers/clk/mediatek/clk-mt7622.c                             | 1 -
 drivers/clk/mediatek/clk-mt7629-hif.c                         | 1 -
 drivers/clk/mediatek/clk-mt7981-apmixed.c                     | 1 -
 drivers/clk/mediatek/clk-mt7981-eth.c                         | 1 -
 drivers/clk/mediatek/clk-mt7981-infracfg.c                    | 1 -
 drivers/clk/mediatek/clk-mt7981-topckgen.c                    | 1 -
 drivers/clk/mediatek/clk-mt7986-apmixed.c                     | 1 -
 drivers/clk/mediatek/clk-mt7986-eth.c                         | 1 -
 drivers/clk/mediatek/clk-mt7986-infracfg.c                    | 1 -
 drivers/clk/mediatek/clk-mt7986-topckgen.c                    | 1 -
 drivers/clk/mediatek/clk-mt8167-aud.c                         | 1 -
 drivers/clk/mediatek/clk-mt8167-img.c                         | 1 -
 drivers/clk/mediatek/clk-mt8167-mfgcfg.c                      | 1 -
 drivers/clk/mediatek/clk-mt8167-mm.c                          | 1 -
 drivers/clk/mediatek/clk-mt8167-vdec.c                        | 1 -
 drivers/clk/mediatek/clk-mt8173-mm.c                          | 1 -
 drivers/clk/mediatek/clk-mt8183.c                             | 1 -
 drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c               | 1 -
 drivers/clk/mediatek/clk-mt8188-apmixedsys.c                  | 1 -
 drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c                | 1 -
 drivers/clk/mediatek/clk-mt8188-topckgen.c                    | 1 -
 drivers/clk/mediatek/clk-mt8188-vdo0.c                        | 1 -
 drivers/clk/mediatek/clk-mt8188-vdo1.c                        | 1 -
 drivers/clk/mediatek/clk-mt8188-venc.c                        | 1 -
 drivers/clk/mediatek/clk-mt8188-wpe.c                         | 1 -
 drivers/clk/mediatek/clk-mt8192-cam.c                         | 1 -
 drivers/clk/mediatek/clk-mt8192-img.c                         | 1 -
 drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c                | 1 -
 drivers/clk/mediatek/clk-mt8192-ipe.c                         | 1 -
 drivers/clk/mediatek/clk-mt8192-mdp.c                         | 1 -
 drivers/clk/mediatek/clk-mt8192-mfg.c                         | 1 -
 drivers/clk/mediatek/clk-mt8192-msdc.c                        | 1 -
 drivers/clk/mediatek/clk-mt8192-scp_adsp.c                    | 1 -
 drivers/clk/mediatek/clk-mt8192-vdec.c                        | 1 -
 drivers/clk/mediatek/clk-mt8192-venc.c                        | 1 -
 drivers/clk/mediatek/clk-mt8192.c                             | 1 -
 drivers/clk/mediatek/clk-mt8195-apmixedsys.c                  | 1 -
 drivers/clk/mediatek/clk-mt8195-topckgen.c                    | 1 -
 drivers/clk/mediatek/clk-mt8365.c                             | 1 -
 drivers/clk/mediatek/clk-mt8516-aud.c                         | 1 -
 drivers/clk/meson/a1-peripherals.c                            | 1 -
 drivers/clk/meson/a1-pll.c                                    | 1 -
 drivers/clk/meson/axg.c                                       | 1 -
 drivers/clk/meson/gxbb.c                                      | 1 -
 drivers/clk/qcom/cambistmclkcc-kaanapali.c                    | 1 -
 drivers/clk/qcom/cambistmclkcc-sm8750.c                       | 1 -
 drivers/clk/qcom/camcc-kaanapali.c                            | 1 -
 drivers/clk/qcom/camcc-milos.c                                | 1 -
 drivers/clk/qcom/camcc-qcs615.c                               | 1 -
 drivers/clk/qcom/camcc-sa8775p.c                              | 1 -
 drivers/clk/qcom/camcc-sc7180.c                               | 1 -
 drivers/clk/qcom/camcc-sc7280.c                               | 1 -
 drivers/clk/qcom/camcc-sc8180x.c                              | 1 -
 drivers/clk/qcom/camcc-sc8280xp.c                             | 1 -
 drivers/clk/qcom/camcc-sdm845.c                               | 1 -
 drivers/clk/qcom/camcc-sm4450.c                               | 1 -
 drivers/clk/qcom/camcc-sm6350.c                               | 1 -
 drivers/clk/qcom/camcc-sm7150.c                               | 1 -
 drivers/clk/qcom/camcc-sm8150.c                               | 1 -
 drivers/clk/qcom/camcc-sm8250.c                               | 1 -
 drivers/clk/qcom/camcc-sm8450.c                               | 1 -
 drivers/clk/qcom/camcc-sm8550.c                               | 1 -
 drivers/clk/qcom/camcc-sm8650.c                               | 1 -
 drivers/clk/qcom/camcc-sm8750.c                               | 1 -
 drivers/clk/qcom/camcc-x1e80100.c                             | 1 -
 drivers/clk/qcom/dispcc-eliza.c                               | 1 -
 drivers/clk/qcom/dispcc-glymur.c                              | 1 -
 drivers/clk/qcom/dispcc-kaanapali.c                           | 1 -
 drivers/clk/qcom/dispcc-milos.c                               | 1 -
 drivers/clk/qcom/dispcc-qcm2290.c                             | 1 -
 drivers/clk/qcom/dispcc-qcs615.c                              | 1 -
 drivers/clk/qcom/dispcc-sc7180.c                              | 1 -
 drivers/clk/qcom/dispcc-sc7280.c                              | 1 -
 drivers/clk/qcom/dispcc-sc8280xp.c                            | 1 -
 drivers/clk/qcom/dispcc-sdm845.c                              | 1 -
 drivers/clk/qcom/dispcc-sm4450.c                              | 1 -
 drivers/clk/qcom/dispcc-sm6115.c                              | 1 -
 drivers/clk/qcom/dispcc-sm6125.c                              | 1 -
 drivers/clk/qcom/dispcc-sm6350.c                              | 1 -
 drivers/clk/qcom/dispcc-sm6375.c                              | 1 -
 drivers/clk/qcom/dispcc-sm7150.c                              | 1 -
 drivers/clk/qcom/dispcc-sm8250.c                              | 1 -
 drivers/clk/qcom/dispcc-sm8450.c                              | 1 -
 drivers/clk/qcom/dispcc-sm8550.c                              | 1 -
 drivers/clk/qcom/dispcc-sm8750.c                              | 1 -
 drivers/clk/qcom/dispcc-x1e80100.c                            | 1 -
 drivers/clk/qcom/dispcc0-sa8775p.c                            | 1 -
 drivers/clk/qcom/dispcc1-sa8775p.c                            | 1 -
 drivers/clk/qcom/ecpricc-qdu1000.c                            | 1 -
 drivers/clk/qcom/gcc-eliza.c                                  | 1 -
 drivers/clk/qcom/gcc-glymur.c                                 | 1 -
 drivers/clk/qcom/gcc-ipq5018.c                                | 1 -
 drivers/clk/qcom/gcc-ipq5332.c                                | 1 -
 drivers/clk/qcom/gcc-kaanapali.c                              | 1 -
 drivers/clk/qcom/gcc-milos.c                                  | 1 -
 drivers/clk/qcom/gcc-nord.c                                   | 1 -
 drivers/clk/qcom/gcc-qcs615.c                                 | 1 -
 drivers/clk/qcom/gcc-qcs8300.c                                | 1 -
 drivers/clk/qcom/gcc-sa8775p.c                                | 1 -
 drivers/clk/qcom/gcc-sdx75.c                                  | 1 -
 drivers/clk/qcom/gcc-sm4450.c                                 | 1 -
 drivers/clk/qcom/gcc-sm7150.c                                 | 1 -
 drivers/clk/qcom/gcc-sm8650.c                                 | 1 -
 drivers/clk/qcom/gcc-sm8750.c                                 | 1 -
 drivers/clk/qcom/gcc-x1e80100.c                               | 1 -
 drivers/clk/qcom/gpucc-glymur.c                               | 1 -
 drivers/clk/qcom/gpucc-kaanapali.c                            | 1 -
 drivers/clk/qcom/gpucc-milos.c                                | 1 -
 drivers/clk/qcom/gpucc-msm8998.c                              | 1 -
 drivers/clk/qcom/gpucc-qcm2290.c                              | 1 -
 drivers/clk/qcom/gpucc-qcs615.c                               | 1 -
 drivers/clk/qcom/gpucc-sa8775p.c                              | 1 -
 drivers/clk/qcom/gpucc-sar2130p.c                             | 1 -
 drivers/clk/qcom/gpucc-sc7180.c                               | 1 -
 drivers/clk/qcom/gpucc-sc7280.c                               | 1 -
 drivers/clk/qcom/gpucc-sc8280xp.c                             | 1 -
 drivers/clk/qcom/gpucc-sdm660.c                               | 1 -
 drivers/clk/qcom/gpucc-sdm845.c                               | 1 -
 drivers/clk/qcom/gpucc-sm4450.c                               | 1 -
 drivers/clk/qcom/gpucc-sm6115.c                               | 1 -
 drivers/clk/qcom/gpucc-sm6125.c                               | 1 -
 drivers/clk/qcom/gpucc-sm6350.c                               | 1 -
 drivers/clk/qcom/gpucc-sm6375.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8150.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8250.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8350.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8450.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8550.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8650.c                               | 1 -
 drivers/clk/qcom/gpucc-sm8750.c                               | 1 -
 drivers/clk/qcom/gpucc-x1e80100.c                             | 1 -
 drivers/clk/qcom/gpucc-x1p42100.c                             | 1 -
 drivers/clk/qcom/gxclkctl-kaanapali.c                         | 1 -
 drivers/clk/qcom/ipq-cmn-pll.c                                | 1 -
 drivers/clk/qcom/lpasscc-sc8280xp.c                           | 1 -
 drivers/clk/qcom/lpasscc-sm6115.c                             | 1 -
 drivers/clk/qcom/mmcc-apq8084.c                               | 1 -
 drivers/clk/qcom/mmcc-msm8960.c                               | 1 -
 drivers/clk/qcom/mmcc-msm8974.c                               | 1 -
 drivers/clk/qcom/mmcc-msm8994.c                               | 1 -
 drivers/clk/qcom/mmcc-msm8996.c                               | 1 -
 drivers/clk/qcom/mmcc-msm8998.c                               | 1 -
 drivers/clk/qcom/mmcc-sdm660.c                                | 1 -
 drivers/clk/qcom/negcc-nord.c                                 | 1 -
 drivers/clk/qcom/nwgcc-nord.c                                 | 1 -
 drivers/clk/qcom/segcc-nord.c                                 | 1 -
 drivers/clk/qcom/tcsrcc-eliza.c                               | 1 -
 drivers/clk/qcom/tcsrcc-glymur.c                              | 1 -
 drivers/clk/qcom/tcsrcc-nord.c                                | 1 -
 drivers/clk/qcom/tcsrcc-sm8650.c                              | 1 -
 drivers/clk/qcom/tcsrcc-sm8750.c                              | 1 -
 drivers/clk/qcom/tcsrcc-x1e80100.c                            | 1 -
 drivers/clk/qcom/videocc-glymur.c                             | 1 -
 drivers/clk/qcom/videocc-kaanapali.c                          | 1 -
 drivers/clk/qcom/videocc-milos.c                              | 1 -
 drivers/clk/qcom/videocc-qcs615.c                             | 1 -
 drivers/clk/qcom/videocc-sa8775p.c                            | 1 -
 drivers/clk/qcom/videocc-sm7150.c                             | 1 -
 drivers/clk/qcom/videocc-sm8450.c                             | 1 -
 drivers/clk/qcom/videocc-sm8550.c                             | 1 -
 drivers/clk/qcom/videocc-sm8750.c                             | 1 -
 drivers/clk/renesas/clk-vbattb.c                              | 1 -
 drivers/clk/renesas/renesas-cpg-mssr.c                        | 1 -
 drivers/clk/renesas/rzg2l-cpg.c                               | 1 -
 drivers/clk/renesas/rzv2h-cpg.c                               | 1 -
 drivers/clk/samsung/clk-exynos-audss.c                        | 1 -
 drivers/clk/samsung/clk-exynos-clkout.c                       | 1 -
 drivers/clk/samsung/clk-exynos2200.c                          | 1 -
 drivers/clk/samsung/clk-exynos3250.c                          | 1 -
 drivers/clk/samsung/clk-exynos4.c                             | 1 -
 drivers/clk/samsung/clk-exynos4412-isp.c                      | 1 -
 drivers/clk/samsung/clk-exynos5-subcmu.c                      | 1 -
 drivers/clk/samsung/clk-exynos5250.c                          | 1 -
 drivers/clk/samsung/clk-exynos5420.c                          | 1 -
 drivers/clk/samsung/clk-exynos5433.c                          | 1 -
 drivers/clk/samsung/clk-exynos7870.c                          | 1 -
 drivers/clk/samsung/clk-exynos7885.c                          | 1 -
 drivers/clk/samsung/clk-exynos850.c                           | 1 -
 drivers/clk/samsung/clk-exynos8895.c                          | 1 -
 drivers/clk/samsung/clk-exynos990.c                           | 1 -
 drivers/clk/samsung/clk-exynosautov9.c                        | 1 -
 drivers/clk/samsung/clk-exynosautov920.c                      | 1 -
 drivers/clk/samsung/clk-fsd.c                                 | 1 -
 drivers/clk/samsung/clk-gs101.c                               | 1 -
 drivers/clk/samsung/clk-s5pv210-audss.c                       | 1 -
 drivers/clk/samsung/clk.c                                     | 1 -
 drivers/clk/sprd/ums512-clk.c                                 | 1 -
 drivers/clk/starfive/clk-starfive-jh7100-audio.c              | 1 -
 drivers/clk/starfive/clk-starfive-jh7100.c                    | 1 -
 drivers/clk/tegra/clk-device.c                                | 1 -
 drivers/clk/xilinx/xlnx_vcu.c                                 | 1 -
 drivers/counter/interrupt-cnt.c                               | 1 -
 drivers/counter/stm32-lptimer-cnt.c                           | 1 -
 drivers/counter/stm32-timer-cnt.c                             | 1 -
 drivers/counter/ti-ecap-capture.c                             | 1 -
 drivers/counter/ti-eqep.c                                     | 1 -
 drivers/cpufreq/amd_freq_sensitivity.c                        | 1 -
 drivers/cpufreq/armada-37xx-cpufreq.c                         | 1 -
 drivers/crypto/atmel-aes.c                                    | 1 -
 drivers/crypto/atmel-sha.c                                    | 1 -
 drivers/crypto/atmel-tdes.c                                   | 1 -
 drivers/crypto/hifn_795x.c                                    | 1 -
 drivers/crypto/img-hash.c                                     | 1 -
 drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c           | 1 -
 drivers/crypto/qce/core.c                                     | 1 -
 drivers/crypto/starfive/jh7110-cryp.c                         | 1 -
 drivers/crypto/talitos.c                                      | 1 -
 drivers/crypto/tegra/tegra-se-main.c                          | 1 -
 drivers/crypto/ti/dthev2-common.c                             | 1 -
 drivers/crypto/xilinx/zynqmp-aes-gcm.c                        | 1 -
 drivers/devfreq/hisi_uncore_freq.c                            | 1 -
 drivers/devfreq/imx8m-ddrc.c                                  | 1 -
 drivers/dma/amd/qdma/qdma.c                                   | 1 -
 drivers/dma/ep93xx_dma.c                                      | 1 -
 drivers/dma/qcom/hidma.c                                      | 1 -
 drivers/dma/sf-pdma/sf-pdma.c                                 | 1 -
 drivers/dma/xgene-dma.c                                       | 1 -
 drivers/dma/xilinx/xdma.c                                     | 1 -
 drivers/dpll/zl3073x/dpll.c                                   | 1 -
 drivers/edac/fsl_ddr_edac.c                                   | 1 -
 drivers/edac/mpc85xx_edac.c                                   | 1 -
 drivers/edac/pnd2_edac.c                                      | 1 -
 drivers/edac/sb_edac.c                                        | 1 -
 drivers/extcon/extcon-intel-cht-wc.c                          | 1 -
 drivers/extcon/extcon-intel-mrfld.c                           | 1 -
 drivers/extcon/extcon-max14526.c                              | 1 -
 drivers/extcon/extcon-max3355.c                               | 1 -
 drivers/extcon/extcon-qcom-spmi-misc.c                        | 1 -
 drivers/extcon/extcon-usb-gpio.c                              | 1 -
 drivers/firewire/core-device.c                                | 1 -
 drivers/firewire/net.c                                        | 1 -
 drivers/firewire/sbp2.c                                       | 1 -
 drivers/firmware/google/cbmem.c                               | 2 +-
 drivers/firmware/google/coreboot_table.c                      | 2 +-
 drivers/firmware/google/framebuffer-coreboot.c                | 2 +-
 drivers/firmware/google/memconsole-coreboot.c                 | 2 +-
 drivers/firmware/google/vpd.c                                 | 2 +-
 drivers/firmware/qemu_fw_cfg.c                                | 1 -
 drivers/fpga/altera-freeze-bridge.c                           | 1 -
 drivers/fpga/altera-pr-ip-core-plat.c                         | 1 -
 drivers/fpga/ice40-spi.c                                      | 1 -
 drivers/fpga/intel-m10-bmc-sec-update.c                       | 1 -
 drivers/fpga/xilinx-selectmap.c                               | 1 -
 drivers/fpga/xilinx-spi.c                                     | 1 -
 drivers/fsi/fsi-master-i2cr.c                                 | 1 -
 drivers/fsi/fsi-scom.c                                        | 2 +-
 drivers/fsi/i2cr-scom.c                                       | 1 -
 drivers/gpib/eastwood/fluke_gpib.c                            | 1 -
 drivers/gpio/gpio-74xx-mmio.c                                 | 1 -
 drivers/gpio/gpio-adnp.c                                      | 1 -
 drivers/gpio/gpio-aggregator.c                                | 1 -
 drivers/gpio/gpio-altera-a10sr.c                              | 2 +-
 drivers/gpio/gpio-altera.c                                    | 1 -
 drivers/gpio/gpio-ath79.c                                     | 1 -
 drivers/gpio/gpio-bcm-kona.c                                  | 1 -
 drivers/gpio/gpio-by-pinctrl.c                                | 1 -
 drivers/gpio/gpio-cros-ec.c                                   | 1 -
 drivers/gpio/gpio-dwapb.c                                     | 1 -
 drivers/gpio/gpio-en7523.c                                    | 1 -
 drivers/gpio/gpio-ge.c                                        | 1 -
 drivers/gpio/gpio-graniterapids.c                             | 1 -
 drivers/gpio/gpio-hisi.c                                      | 1 -
 drivers/gpio/gpio-idt3243x.c                                  | 1 -
 drivers/gpio/gpio-latch.c                                     | 1 -
 drivers/gpio/gpio-line-mux.c                                  | 1 -
 drivers/gpio/gpio-ltc4283.c                                   | 1 -
 drivers/gpio/gpio-max7360.c                                   | 1 -
 drivers/gpio/gpio-max77759.c                                  | 1 -
 drivers/gpio/gpio-mb86s7x.c                                   | 1 -
 drivers/gpio/gpio-mlxbf2.c                                    | 1 -
 drivers/gpio/gpio-mmio.c                                      | 1 -
 drivers/gpio/gpio-mockup.c                                    | 1 -
 drivers/gpio/gpio-mpc8xxx.c                                   | 1 -
 drivers/gpio/gpio-mpfs.c                                      | 1 -
 drivers/gpio/gpio-nomadik.c                                   | 1 -
 drivers/gpio/gpio-pca953x.c                                   | 1 -
 drivers/gpio/gpio-pcf857x.c                                   | 1 -
 drivers/gpio/gpio-qixis-fpga.c                                | 1 -
 drivers/gpio/gpio-realtek-otto.c                              | 1 -
 drivers/gpio/gpio-shared-proxy.c                              | 1 -
 drivers/gpio/gpio-sim.c                                       | 1 -
 drivers/gpio/gpio-sl28cpld.c                                  | 1 -
 drivers/gpio/gpio-sloppy-logic-analyzer.c                     | 1 -
 drivers/gpio/gpio-sprd.c                                      | 1 -
 drivers/gpio/gpio-tn48m.c                                     | 1 -
 drivers/gpio/gpio-virtuser.c                                  | 1 -
 drivers/gpio/gpio-wcd934x.c                                   | 1 -
 drivers/gpio/gpio-xgene-sb.c                                  | 1 -
 drivers/gpio/gpio-xra1403.c                                   | 1 -
 drivers/gpio/gpio-zevio.c                                     | 1 -
 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c                       | 1 -
 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c                   | 1 -
 drivers/gpu/drm/bridge/inno-hdmi.c                            | 1 -
 drivers/gpu/drm/bridge/ssd2825.c                              | 1 -
 drivers/gpu/drm/bridge/tc358762.c                             | 2 +-
 drivers/gpu/drm/bridge/tc358764.c                             | 2 +-
 drivers/gpu/drm/bridge/th1520-dw-hdmi.c                       | 1 -
 drivers/gpu/drm/drm_panel_backlight_quirks.c                  | 1 -
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c                         | 1 -
 drivers/gpu/drm/exynos/exynos_drm_gsc.c                       | 1 -
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c                  | 1 -
 drivers/gpu/drm/imagination/pvr_drv.c                         | 1 -
 drivers/gpu/drm/imx/dc/dc-cf.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-de.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-drv.c                               | 1 -
 drivers/gpu/drm/imx/dc/dc-ed.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-fg.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-fl.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-fw.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-lb.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-pe.c                                | 1 -
 drivers/gpu/drm/imx/dc/dc-tc.c                                | 1 -
 drivers/gpu/drm/imx/lcdc/imx-lcdc.c                           | 1 -
 drivers/gpu/drm/mediatek/mtk_cec.c                            | 1 -
 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c                       | 1 -
 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c                     | 1 -
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                             | 1 -
 drivers/gpu/drm/panel/panel-arm-versatile.c                   | 1 -
 drivers/gpu/drm/panel/panel-auo-a030jtn01.c                   | 1 -
 drivers/gpu/drm/panel/panel-boe-td4320.c                      | 2 +-
 drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c             | 2 +-
 drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c         | 2 +-
 drivers/gpu/drm/panel/panel-himax-hx83112b.c                  | 1 -
 drivers/gpu/drm/panel/panel-himax-hx83121a.c                  | 1 -
 drivers/gpu/drm/panel/panel-himax-hx8394.c                    | 1 -
 drivers/gpu/drm/panel/panel-hydis-hv101hd1.c                  | 2 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9341.c                  | 1 -
 drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c             | 1 -
 drivers/gpu/drm/panel/panel-lg-ld070wx3.c                     | 2 +-
 drivers/gpu/drm/panel/panel-motorola-mot.c                    | 2 +-
 drivers/gpu/drm/panel/panel-novatek-nt35532.c                 | 2 +-
 drivers/gpu/drm/panel/panel-novatek-nt37801.c                 | 1 -
 drivers/gpu/drm/panel/panel-orisetech-otm8009a.c              | 1 -
 drivers/gpu/drm/panel/panel-raydium-rm67200.c                 | 2 +-
 drivers/gpu/drm/panel/panel-raydium-rm68200.c                 | 2 +-
 drivers/gpu/drm/panel/panel-renesas-r61307.c                  | 2 +-
 drivers/gpu/drm/panel/panel-renesas-r69328.c                  | 2 +-
 drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c              | 2 +-
 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c                 | 2 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c              | 1 -
 drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c             | 2 +-
 drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams427ap24.c      | 1 -
 drivers/gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c         | 1 -
 drivers/gpu/drm/panel/panel-sitronix-st7703.c                 | 1 -
 drivers/gpu/drm/panel/panel-summit.c                          | 1 -
 drivers/gpu/drm/panel/panel-visionox-rm69299.c                | 1 -
 drivers/gpu/drm/panel/panel-visionox-rm692e5.c                | 1 -
 drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c                | 1 -
 drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c              | 1 -
 drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c                 | 1 -
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c                  | 1 -
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c                   | 1 -
 drivers/gpu/drm/sprd/sprd_drm.c                               | 1 -
 drivers/gpu/drm/sti/sti_hda.c                                 | 1 -
 drivers/gpu/drm/stm/drv.c                                     | 1 -
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c                         | 1 -
 drivers/gpu/drm/sun4i/sun6i_drc.c                             | 1 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                           | 1 -
 drivers/gpu/drm/tiny/sharp-memory.c                           | 1 -
 drivers/gpu/drm/vc4/vc4_dpi.c                                 | 1 -
 drivers/gpu/drm/vc4/vc4_txp.c                                 | 1 -
 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c                      | 1 -
 drivers/hsi/controllers/omap_ssi_port.c                       | 1 -
 drivers/hte/hte-tegra194-test.c                               | 1 -
 drivers/hwmon/adcxx.c                                         | 1 -
 drivers/hwmon/adt7410.c                                       | 1 -
 drivers/hwmon/adt7462.c                                       | 1 -
 drivers/hwmon/adt7475.c                                       | 1 -
 drivers/hwmon/as370-hwmon.c                                   | 1 -
 drivers/hwmon/axi-fan-control.c                               | 1 -
 drivers/hwmon/cros_ec_hwmon.c                                 | 1 -
 drivers/hwmon/gxp-fan-ctrl.c                                  | 1 -
 drivers/hwmon/iio_hwmon.c                                     | 1 -
 drivers/hwmon/intel-m10-bmc-hwmon.c                           | 1 -
 drivers/hwmon/jc42.c                                          | 1 -
 drivers/hwmon/lan966x-hwmon.c                                 | 1 -
 drivers/hwmon/lm70.c                                          | 1 -
 drivers/hwmon/lm75.c                                          | 1 -
 drivers/hwmon/ltc2947-core.c                                  | 1 -
 drivers/hwmon/ltc4282.c                                       | 1 -
 drivers/hwmon/ltc4283.c                                       | 1 -
 drivers/hwmon/ltq-cputemp.c                                   | 1 -
 drivers/hwmon/max197.c                                        | 1 -
 drivers/hwmon/mc13783-adc.c                                   | 1 -
 drivers/hwmon/mr75203.c                                       | 1 -
 drivers/hwmon/ntc_thermistor.c                                | 1 -
 drivers/hwmon/occ/p9_sbe.c                                    | 1 -
 drivers/hwmon/pmbus/adp1050.c                                 | 1 -
 drivers/hwmon/pmbus/e50sn12051.c                              | 1 -
 drivers/hwmon/pmbus/lt3074.c                                  | 1 -
 drivers/hwmon/pmbus/max17616.c                                | 1 -
 drivers/hwmon/pmbus/max20830.c                                | 1 -
 drivers/hwmon/pmbus/mp2975.c                                  | 1 -
 drivers/hwmon/pmbus/stef48h28.c                               | 1 -
 drivers/hwmon/pwm-fan.c                                       | 1 -
 drivers/hwmon/sch5627.c                                       | 1 -
 drivers/hwmon/sch5636.c                                       | 1 -
 drivers/hwmon/sl28cpld-hwmon.c                                | 1 -
 drivers/hwmon/smpro-hwmon.c                                   | 1 -
 drivers/hwmon/sparx5-temp.c                                   | 1 -
 drivers/hwmon/tmp102.c                                        | 1 -
 drivers/hwmon/tmp108.c                                        | 1 -
 drivers/hwtracing/coresight/ultrasoc-smb.c                    | 1 -
 drivers/i2c/busses/i2c-amd-asf-plat.c                         | 1 -
 drivers/i2c/busses/i2c-gxp.c                                  | 1 -
 drivers/i2c/busses/i2c-hisi.c                                 | 1 -
 drivers/i2c/busses/i2c-rtl9300.c                              | 1 -
 drivers/i2c/busses/i2c-rzv2m.c                                | 1 -
 drivers/iio/accel/adxl313_i2c.c                               | 1 -
 drivers/iio/accel/adxl313_spi.c                               | 1 -
 drivers/iio/accel/adxl355_core.c                              | 1 -
 drivers/iio/accel/adxl355_i2c.c                               | 1 -
 drivers/iio/accel/adxl355_spi.c                               | 1 -
 drivers/iio/accel/adxl367.c                                   | 1 -
 drivers/iio/accel/adxl367_i2c.c                               | 1 -
 drivers/iio/accel/adxl367_spi.c                               | 1 -
 drivers/iio/accel/adxl372_i2c.c                               | 1 -
 drivers/iio/accel/adxl372_spi.c                               | 1 -
 drivers/iio/accel/adxl380_i2c.c                               | 1 -
 drivers/iio/accel/adxl380_spi.c                               | 1 -
 drivers/iio/accel/bma180.c                                    | 1 -
 drivers/iio/accel/bma220_core.c                               | 1 -
 drivers/iio/accel/bma220_i2c.c                                | 1 -
 drivers/iio/accel/bma220_spi.c                                | 1 -
 drivers/iio/accel/bma400_i2c.c                                | 1 -
 drivers/iio/accel/bma400_spi.c                                | 1 -
 drivers/iio/accel/bmc150-accel-i2c.c                          | 1 -
 drivers/iio/accel/bmc150-accel-spi.c                          | 1 -
 drivers/iio/accel/bmi088-accel-i2c.c                          | 1 -
 drivers/iio/accel/dmard06.c                                   | 1 -
 drivers/iio/accel/fxls8962af-core.c                           | 1 -
 drivers/iio/accel/fxls8962af-i2c.c                            | 1 -
 drivers/iio/accel/fxls8962af-spi.c                            | 1 -
 drivers/iio/accel/hid-sensor-accel-3d.c                       | 1 -
 drivers/iio/accel/kxcjk-1013.c                                | 1 -
 drivers/iio/accel/kxsd9-i2c.c                                 | 1 -
 drivers/iio/accel/kxsd9-spi.c                                 | 1 -
 drivers/iio/accel/mma7660.c                                   | 1 -
 drivers/iio/accel/mma8452.c                                   | 1 -
 drivers/iio/accel/mma9551.c                                   | 1 -
 drivers/iio/accel/mma9553.c                                   | 1 -
 drivers/iio/accel/msa311.c                                    | 1 -
 drivers/iio/accel/mxc4005.c                                   | 1 -
 drivers/iio/accel/mxc6255.c                                   | 1 -
 drivers/iio/accel/st_accel_i2c.c                              | 1 -
 drivers/iio/accel/st_accel_spi.c                              | 1 -
 drivers/iio/accel/stk8ba50.c                                  | 1 -
 drivers/iio/adc/88pm886-gpadc.c                               | 1 -
 drivers/iio/adc/ad4000.c                                      | 1 -
 drivers/iio/adc/ad4080.c                                      | 1 -
 drivers/iio/adc/ad4134.c                                      | 1 -
 drivers/iio/adc/ad4851.c                                      | 1 -
 drivers/iio/adc/ad7124.c                                      | 1 -
 drivers/iio/adc/ad7173.c                                      | 1 -
 drivers/iio/adc/ad7191.c                                      | 1 -
 drivers/iio/adc/ad7192.c                                      | 1 -
 drivers/iio/adc/ad7280a.c                                     | 1 -
 drivers/iio/adc/ad7292.c                                      | 1 -
 drivers/iio/adc/ad7298.c                                      | 1 -
 drivers/iio/adc/ad7405.c                                      | 1 -
 drivers/iio/adc/ad7606_par.c                                  | 1 -
 drivers/iio/adc/ad7625.c                                      | 1 -
 drivers/iio/adc/ad7779.c                                      | 1 -
 drivers/iio/adc/adi-axi-adc.c                                 | 1 -
 drivers/iio/adc/at91-sama5d2_adc.c                            | 1 -
 drivers/iio/adc/axp20x_adc.c                                  | 1 -
 drivers/iio/adc/bcm_iproc_adc.c                               | 1 -
 drivers/iio/adc/berlin2-adc.c                                 | 1 -
 drivers/iio/adc/cpcap-adc.c                                   | 1 -
 drivers/iio/adc/envelope-detector.c                           | 1 -
 drivers/iio/adc/fsl-imx25-gcq.c                               | 1 -
 drivers/iio/adc/hi8435.c                                      | 1 -
 drivers/iio/adc/hx711.c                                       | 1 -
 drivers/iio/adc/imx7d_adc.c                                   | 1 -
 drivers/iio/adc/imx8qxp-adc.c                                 | 1 -
 drivers/iio/adc/imx93_adc.c                                   | 1 -
 drivers/iio/adc/ingenic-adc.c                                 | 1 -
 drivers/iio/adc/intel_dc_ti_adc.c                             | 1 -
 drivers/iio/adc/intel_mrfld_adc.c                             | 1 -
 drivers/iio/adc/lpc18xx_adc.c                                 | 1 -
 drivers/iio/adc/lpc32xx_adc.c                                 | 1 -
 drivers/iio/adc/ltc2496.c                                     | 1 -
 drivers/iio/adc/ltc2497.c                                     | 1 -
 drivers/iio/adc/max1027.c                                     | 1 -
 drivers/iio/adc/max11100.c                                    | 1 -
 drivers/iio/adc/max1118.c                                     | 1 -
 drivers/iio/adc/max1363.c                                     | 1 -
 drivers/iio/adc/max14001.c                                    | 1 -
 drivers/iio/adc/max34408.c                                    | 1 -
 drivers/iio/adc/max77541-adc.c                                | 1 -
 drivers/iio/adc/max9611.c                                     | 1 -
 drivers/iio/adc/mcp320x.c                                     | 1 -
 drivers/iio/adc/mcp3422.c                                     | 1 -
 drivers/iio/adc/mcp3911.c                                     | 1 -
 drivers/iio/adc/mp2629_adc.c                                  | 1 -
 drivers/iio/adc/mt6359-auxadc.c                               | 1 -
 drivers/iio/adc/mt6360-adc.c                                  | 1 -
 drivers/iio/adc/mt6370-adc.c                                  | 1 -
 drivers/iio/adc/mt6577_auxadc.c                               | 1 -
 drivers/iio/adc/nau7802.c                                     | 1 -
 drivers/iio/adc/nct7201.c                                     | 1 -
 drivers/iio/adc/npcm_adc.c                                    | 1 -
 drivers/iio/adc/nxp-sar-adc.c                                 | 1 -
 drivers/iio/adc/qcom-pm8xxx-xoadc.c                           | 1 -
 drivers/iio/adc/qcom-spmi-adc5-gen3.c                         | 1 -
 drivers/iio/adc/qcom-spmi-adc5.c                              | 1 -
 drivers/iio/adc/qcom-spmi-rradc.c                             | 1 -
 drivers/iio/adc/qcom-spmi-vadc.c                              | 1 -
 drivers/iio/adc/rohm-bd79112.c                                | 1 -
 drivers/iio/adc/rohm-bd79124.c                                | 1 -
 drivers/iio/adc/rtq6056.c                                     | 1 -
 drivers/iio/adc/rzg2l_adc.c                                   | 1 -
 drivers/iio/adc/rzn1-adc.c                                    | 1 -
 drivers/iio/adc/rzt2h_adc.c                                   | 1 -
 drivers/iio/adc/sd_adc_modulator.c                            | 1 -
 drivers/iio/adc/sophgo-cv1800b-adc.c                          | 1 -
 drivers/iio/adc/spear_adc.c                                   | 1 -
 drivers/iio/adc/stm32-adc.c                                   | 1 -
 drivers/iio/adc/sun20i-gpadc-iio.c                            | 1 -
 drivers/iio/adc/ti-adc081c.c                                  | 1 -
 drivers/iio/adc/ti-adc0832.c                                  | 1 -
 drivers/iio/adc/ti-adc084s021.c                               | 1 -
 drivers/iio/adc/ti-adc108s102.c                               | 1 -
 drivers/iio/adc/ti-adc128s052.c                               | 1 -
 drivers/iio/adc/ti-adc161s626.c                               | 1 -
 drivers/iio/adc/ti-ads1018.c                                  | 1 -
 drivers/iio/adc/ti-ads124s08.c                                | 1 -
 drivers/iio/adc/ti-ads131m02.c                                | 1 -
 drivers/iio/adc/ti-ads8688.c                                  | 1 -
 drivers/iio/adc/ti-tlc4541.c                                  | 1 -
 drivers/iio/adc/twl4030-madc.c                                | 1 -
 drivers/iio/adc/twl6030-gpadc.c                               | 1 -
 drivers/iio/adc/vf610_adc.c                                   | 1 -
 drivers/iio/adc/xilinx-ams.c                                  | 1 -
 drivers/iio/adc/xilinx-xadc-core.c                            | 1 -
 drivers/iio/addac/ad74413r.c                                  | 1 -
 drivers/iio/afe/iio-rescale.c                                 | 1 -
 drivers/iio/amplifiers/ad8366.c                               | 1 -
 drivers/iio/amplifiers/adl8113.c                              | 1 -
 drivers/iio/amplifiers/hmc425a.c                              | 1 -
 drivers/iio/cdc/ad7150.c                                      | 1 -
 drivers/iio/chemical/ams-iaq-core.c                           | 1 -
 drivers/iio/chemical/atlas-ezo-sensor.c                       | 1 -
 drivers/iio/chemical/atlas-sensor.c                           | 1 -
 drivers/iio/chemical/bme680_spi.c                             | 1 -
 drivers/iio/chemical/mhz19b.c                                 | 1 -
 drivers/iio/chemical/pms7003.c                                | 1 -
 drivers/iio/chemical/scd30_i2c.c                              | 1 -
 drivers/iio/chemical/scd30_serial.c                           | 1 -
 drivers/iio/chemical/sgp30.c                                  | 1 -
 drivers/iio/chemical/sps30_i2c.c                              | 1 -
 drivers/iio/chemical/sps30_serial.c                           | 1 -
 drivers/iio/chemical/sunrise_co2.c                            | 1 -
 drivers/iio/chemical/vz89x.c                                  | 1 -
 drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c        | 1 -
 drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c          | 1 -
 drivers/iio/common/ssp_sensors/ssp_dev.c                      | 1 -
 drivers/iio/dac/ad3530r.c                                     | 1 -
 drivers/iio/dac/ad3552r-hs.c                                  | 1 -
 drivers/iio/dac/ad5446-i2c.c                                  | 1 -
 drivers/iio/dac/ad5446-spi.c                                  | 1 -
 drivers/iio/dac/ad5592r.c                                     | 1 -
 drivers/iio/dac/ad5593r.c                                     | 1 -
 drivers/iio/dac/ad5758.c                                      | 1 -
 drivers/iio/dac/ad7293.c                                      | 1 -
 drivers/iio/dac/ad7303.c                                      | 1 -
 drivers/iio/dac/ad8460.c                                      | 1 -
 drivers/iio/dac/ad9739a.c                                     | 1 -
 drivers/iio/dac/adi-axi-dac.c                                 | 1 -
 drivers/iio/dac/dpot-dac.c                                    | 1 -
 drivers/iio/dac/lpc18xx_dac.c                                 | 1 -
 drivers/iio/dac/ltc2664.c                                     | 1 -
 drivers/iio/dac/ltc2688.c                                     | 1 -
 drivers/iio/dac/max22007.c                                    | 1 -
 drivers/iio/dac/max5522.c                                     | 1 -
 drivers/iio/dac/mcp4725.c                                     | 1 -
 drivers/iio/dac/mcp4728.c                                     | 1 -
 drivers/iio/dac/mcp47feb02.c                                  | 1 -
 drivers/iio/dac/mcp4821.c                                     | 1 -
 drivers/iio/dac/stm32-dac-core.c                              | 1 -
 drivers/iio/dac/stm32-dac.c                                   | 1 -
 drivers/iio/dac/ti-dac082s085.c                               | 1 -
 drivers/iio/dac/ti-dac5571.c                                  | 1 -
 drivers/iio/dac/vf610_dac.c                                   | 1 -
 drivers/iio/filter/admv8818.c                                 | 1 -
 drivers/iio/frequency/adf4350.c                               | 1 -
 drivers/iio/frequency/admfm2000.c                             | 1 -
 drivers/iio/frequency/admv1013.c                              | 1 -
 drivers/iio/frequency/admv1014.c                              | 1 -
 drivers/iio/frequency/adrf6780.c                              | 1 -
 drivers/iio/gyro/bmg160_i2c.c                                 | 1 -
 drivers/iio/gyro/fxas21002c_i2c.c                             | 1 -
 drivers/iio/gyro/fxas21002c_spi.c                             | 1 -
 drivers/iio/gyro/hid-sensor-gyro-3d.c                         | 1 -
 drivers/iio/gyro/st_gyro_i2c.c                                | 1 -
 drivers/iio/gyro/st_gyro_spi.c                                | 1 -
 drivers/iio/health/max30102.c                                 | 1 -
 drivers/iio/humidity/dht11.c                                  | 1 -
 drivers/iio/humidity/ens210.c                                 | 1 -
 drivers/iio/humidity/hdc100x.c                                | 1 -
 drivers/iio/humidity/hid-sensor-humidity.c                    | 1 -
 drivers/iio/humidity/hts221_i2c.c                             | 1 -
 drivers/iio/humidity/htu21.c                                  | 1 -
 drivers/iio/humidity/si7020.c                                 | 1 -
 drivers/iio/imu/adis16475.c                                   | 1 -
 drivers/iio/imu/adis16480.c                                   | 1 -
 drivers/iio/imu/adis16550.c                                   | 1 -
 drivers/iio/imu/bmi160/bmi160_i2c.c                           | 1 -
 drivers/iio/imu/bmi160/bmi160_spi.c                           | 1 -
 drivers/iio/imu/bmi270/bmi270_i2c.c                           | 1 -
 drivers/iio/imu/bmi270/bmi270_spi.c                           | 1 -
 drivers/iio/imu/bmi323/bmi323_i2c.c                           | 1 -
 drivers/iio/imu/bmi323/bmi323_spi.c                           | 1 -
 drivers/iio/imu/bno055/bno055_i2c.c                           | 1 -
 drivers/iio/imu/bno055/bno055_ser_core.c                      | 1 -
 drivers/iio/imu/fxos8700_i2c.c                                | 1 -
 drivers/iio/imu/fxos8700_spi.c                                | 1 -
 drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c               | 1 -
 drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c               | 1 -
 drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c               | 1 -
 drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c               | 1 -
 drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c               | 1 -
 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c                     | 1 -
 drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c                     | 1 -
 drivers/iio/imu/kmx61.c                                       | 1 -
 drivers/iio/imu/smi330/smi330_i2c.c                           | 1 -
 drivers/iio/imu/smi330/smi330_spi.c                           | 1 -
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c                   | 1 -
 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c                   | 1 -
 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c                   | 1 -
 drivers/iio/light/al3000a.c                                   | 1 -
 drivers/iio/light/al3010.c                                    | 1 -
 drivers/iio/light/al3320a.c                                   | 1 -
 drivers/iio/light/bh1780.c                                    | 1 -
 drivers/iio/light/cm32181.c                                   | 1 -
 drivers/iio/light/cm3232.c                                    | 1 -
 drivers/iio/light/cm3605.c                                    | 1 -
 drivers/iio/light/cros_ec_light_prox.c                        | 1 -
 drivers/iio/light/gp2ap020a00f.c                              | 1 -
 drivers/iio/light/hid-sensor-als.c                            | 1 -
 drivers/iio/light/hid-sensor-prox.c                           | 1 -
 drivers/iio/light/isl29018.c                                  | 1 -
 drivers/iio/light/jsa1212.c                                   | 1 -
 drivers/iio/light/ltr501.c                                    | 1 -
 drivers/iio/light/ltrf216a.c                                  | 1 -
 drivers/iio/light/max44000.c                                  | 1 -
 drivers/iio/light/opt3001.c                                   | 1 -
 drivers/iio/light/rpr0521.c                                   | 1 -
 drivers/iio/light/st_uvis25_i2c.c                             | 1 -
 drivers/iio/light/st_uvis25_spi.c                             | 1 -
 drivers/iio/light/stk3310.c                                   | 1 -
 drivers/iio/light/tsl2563.c                                   | 1 -
 drivers/iio/light/us5182d.c                                   | 1 -
 drivers/iio/light/veml6046x00.c                               | 1 -
 drivers/iio/light/vl6180.c                                    | 1 -
 drivers/iio/magnetometer/ak8974.c                             | 1 -
 drivers/iio/magnetometer/ak8975.c                             | 1 -
 drivers/iio/magnetometer/bmc150_magn_i2c.c                    | 1 -
 drivers/iio/magnetometer/bmc150_magn_spi.c                    | 1 -
 drivers/iio/magnetometer/hid-sensor-magn-3d.c                 | 1 -
 drivers/iio/magnetometer/mmc35240.c                           | 1 -
 drivers/iio/magnetometer/mmc5633.c                            | 1 -
 drivers/iio/magnetometer/si7210.c                             | 1 -
 drivers/iio/magnetometer/st_magn_i2c.c                        | 1 -
 drivers/iio/magnetometer/st_magn_spi.c                        | 1 -
 drivers/iio/magnetometer/tlv493d.c                            | 1 -
 drivers/iio/magnetometer/yamaha-yas530.c                      | 1 -
 drivers/iio/multiplexer/iio-mux.c                             | 1 -
 drivers/iio/orientation/hid-sensor-incl-3d.c                  | 1 -
 drivers/iio/orientation/hid-sensor-rotation.c                 | 1 -
 drivers/iio/position/hid-sensor-custom-intel-hinge.c          | 1 -
 drivers/iio/potentiometer/ad5272.c                            | 1 -
 drivers/iio/potentiometer/ds1803.c                            | 1 -
 drivers/iio/potentiometer/max5432.c                           | 1 -
 drivers/iio/potentiometer/max5481.c                           | 1 -
 drivers/iio/potentiometer/max5487.c                           | 1 -
 drivers/iio/potentiometer/mcp4018.c                           | 1 -
 drivers/iio/potentiometer/mcp41010.c                          | 1 -
 drivers/iio/potentiometer/mcp4131.c                           | 1 -
 drivers/iio/potentiometer/mcp4531.c                           | 1 -
 drivers/iio/potentiostat/lmp91000.c                           | 1 -
 drivers/iio/pressure/abp2030pa_i2c.c                          | 1 -
 drivers/iio/pressure/abp2030pa_spi.c                          | 1 -
 drivers/iio/pressure/adp810.c                                 | 1 -
 drivers/iio/pressure/cros_ec_baro.c                           | 1 -
 drivers/iio/pressure/hid-sensor-press.c                       | 1 -
 drivers/iio/pressure/hp206c.c                                 | 1 -
 drivers/iio/pressure/hsc030pa.c                               | 1 -
 drivers/iio/pressure/hsc030pa_i2c.c                           | 1 -
 drivers/iio/pressure/hsc030pa_spi.c                           | 1 -
 drivers/iio/pressure/icp10100.c                               | 1 -
 drivers/iio/pressure/mprls0025pa.c                            | 1 -
 drivers/iio/pressure/mprls0025pa_i2c.c                        | 1 -
 drivers/iio/pressure/mprls0025pa_spi.c                        | 1 -
 drivers/iio/pressure/ms5611_i2c.c                             | 1 -
 drivers/iio/pressure/ms5611_spi.c                             | 1 -
 drivers/iio/pressure/ms5637.c                                 | 1 -
 drivers/iio/pressure/sdp500.c                                 | 1 -
 drivers/iio/pressure/st_pressure_i2c.c                        | 1 -
 drivers/iio/pressure/st_pressure_spi.c                        | 1 -
 drivers/iio/pressure/zpa2326_i2c.c                            | 1 -
 drivers/iio/pressure/zpa2326_spi.c                            | 1 -
 drivers/iio/proximity/as3935.c                                | 1 -
 drivers/iio/proximity/cros_ec_mkbp_proximity.c                | 1 -
 drivers/iio/proximity/d3323aa.c                               | 1 -
 drivers/iio/proximity/hx9023s.c                               | 1 -
 drivers/iio/proximity/isl29501.c                              | 1 -
 drivers/iio/proximity/mb1232.c                                | 1 -
 drivers/iio/proximity/ping.c                                  | 1 -
 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c             | 1 -
 drivers/iio/proximity/srf04.c                                 | 1 -
 drivers/iio/proximity/sx9310.c                                | 1 -
 drivers/iio/proximity/sx9324.c                                | 1 -
 drivers/iio/proximity/sx9360.c                                | 1 -
 drivers/iio/proximity/vl53l1x-i2c.c                           | 1 -
 drivers/iio/resolver/ad2s1200.c                               | 1 -
 drivers/iio/temperature/hid-sensor-temperature.c              | 1 -
 drivers/iio/temperature/ltc2983.c                             | 1 -
 drivers/iio/temperature/max31856.c                            | 1 -
 drivers/iio/temperature/max31865.c                            | 1 -
 drivers/iio/temperature/maxim_thermocouple.c                  | 1 -
 drivers/iio/temperature/mcp9600.c                             | 1 -
 drivers/iio/temperature/mlx90614.c                            | 1 -
 drivers/iio/temperature/mlx90632.c                            | 1 -
 drivers/iio/temperature/mlx90635.c                            | 1 -
 drivers/iio/temperature/tmp006.c                              | 1 -
 drivers/iio/temperature/tmp007.c                              | 1 -
 drivers/iio/temperature/tsys01.c                              | 1 -
 drivers/iio/trigger/stm32-lptimer-trigger.c                   | 1 -
 drivers/iio/trigger/stm32-timer-trigger.c                     | 1 -
 drivers/input/keyboard/adp5585-keys.c                         | 1 -
 drivers/input/keyboard/adp5588-keys.c                         | 1 -
 drivers/input/keyboard/charlieplex_keypad.c                   | 1 -
 drivers/input/keyboard/clps711x-keypad.c                      | 1 -
 drivers/input/keyboard/ep93xx_keypad.c                        | 1 -
 drivers/input/keyboard/max7360-keypad.c                       | 1 -
 drivers/input/keyboard/pinephone-keyboard.c                   | 1 -
 drivers/input/misc/ariel-pwrbutton.c                          | 1 -
 drivers/input/misc/da9063_onkey.c                             | 1 -
 drivers/input/misc/gpio_decoder.c                             | 1 -
 drivers/input/misc/iqs269a.c                                  | 1 -
 drivers/input/misc/iqs626a.c                                  | 1 -
 drivers/input/misc/iqs7222.c                                  | 1 -
 drivers/input/misc/mma8450.c                                  | 1 -
 drivers/input/misc/rt5120-pwrkey.c                            | 1 -
 drivers/input/misc/sc27xx-vibra.c                             | 1 -
 drivers/input/misc/twl4030-pwrbutton.c                        | 1 -
 drivers/input/serio/sun4i-ps2.c                               | 1 -
 drivers/input/serio/xilinx_ps2.c                              | 1 -
 drivers/input/touchscreen/cyttsp5.c                           | 1 -
 drivers/input/touchscreen/himax_hx852x.c                      | 1 -
 drivers/input/touchscreen/hynitron_cstxxx.c                   | 1 -
 drivers/input/touchscreen/ili210x.c                           | 1 -
 drivers/input/touchscreen/iqs5xx.c                            | 1 -
 drivers/input/touchscreen/msg2638.c                           | 1 -
 drivers/input/touchscreen/resistive-adc-touch.c               | 1 -
 drivers/input/touchscreen/tsc2007_core.c                      | 1 -
 drivers/interconnect/mediatek/mt8183.c                        | 1 -
 drivers/interconnect/mediatek/mt8195.c                        | 1 -
 drivers/interconnect/mediatek/mt8196.c                        | 1 -
 drivers/interconnect/qcom/msm8909.c                           | 1 -
 drivers/interconnect/qcom/msm8937.c                           | 1 -
 drivers/interconnect/qcom/msm8939.c                           | 1 -
 drivers/interconnect/qcom/msm8953.c                           | 1 -
 drivers/interconnect/qcom/msm8976.c                           | 1 -
 drivers/interconnect/qcom/msm8996.c                           | 1 -
 drivers/interconnect/qcom/qcm2290.c                           | 1 -
 drivers/interconnect/qcom/qcs404.c                            | 1 -
 drivers/interconnect/qcom/qdu1000.c                           | 1 -
 drivers/interconnect/qcom/sa8775p.c                           | 1 -
 drivers/interconnect/qcom/sc7180.c                            | 1 -
 drivers/interconnect/qcom/sc7280.c                            | 1 -
 drivers/interconnect/qcom/sc8180x.c                           | 1 -
 drivers/interconnect/qcom/sc8280xp.c                          | 1 -
 drivers/interconnect/qcom/sdm660.c                            | 1 -
 drivers/interconnect/qcom/sdm670.c                            | 1 -
 drivers/interconnect/qcom/sdm845.c                            | 1 -
 drivers/interconnect/qcom/sdx55.c                             | 1 -
 drivers/interconnect/qcom/sdx65.c                             | 1 -
 drivers/interconnect/qcom/sm6115.c                            | 1 -
 drivers/interconnect/qcom/sm6350.c                            | 1 -
 drivers/interconnect/qcom/sm7150.c                            | 1 -
 drivers/interconnect/qcom/sm8150.c                            | 1 -
 drivers/interconnect/qcom/sm8250.c                            | 1 -
 drivers/interconnect/qcom/sm8350.c                            | 1 -
 drivers/interconnect/qcom/sm8450.c                            | 1 -
 drivers/interconnect/qcom/sm8550.c                            | 1 -
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c              | 1 -
 drivers/irqchip/irq-imx-intmux.c                              | 1 -
 drivers/irqchip/irq-lan966x-oic.c                             | 1 -
 drivers/irqchip/irq-sl28cpld.c                                | 1 -
 drivers/irqchip/irq-stm32mp-exti.c                            | 1 -
 drivers/leds/flash/leds-rt8515.c                              | 1 -
 drivers/leds/leds-aw200xx.c                                   | 1 -
 drivers/leds/leds-bd2606mvv.c                                 | 1 -
 drivers/leds/leds-cht-wcove.c                                 | 1 -
 drivers/leds/leds-cr0014114.c                                 | 1 -
 drivers/leds/leds-cros_ec.c                                   | 1 -
 drivers/leds/leds-el15203000.c                                | 1 -
 drivers/leds/leds-gpio.c                                      | 1 -
 drivers/leds/leds-is31fl319x.c                                | 1 -
 drivers/leds/leds-lm36274.c                                   | 1 -
 drivers/leds/leds-lm3692x.c                                   | 1 -
 drivers/leds/leds-lm3697.c                                    | 1 -
 drivers/leds/leds-lp50xx.c                                    | 1 -
 drivers/leds/leds-lt3593.c                                    | 1 -
 drivers/leds/leds-max5970.c                                   | 1 -
 drivers/leds/leds-mlxcpld.c                                   | 1 -
 drivers/leds/leds-nic78bx.c                                   | 1 -
 drivers/leds/leds-pca995x.c                                   | 1 -
 drivers/leds/leds-regulator.c                                 | 1 -
 drivers/leds/leds-spi-byte.c                                  | 1 -
 drivers/leds/leds-sun50i-a100.c                               | 1 -
 drivers/leds/rgb/leds-group-multicolor.c                      | 1 -
 drivers/leds/rgb/leds-mt6370-rgb.c                            | 1 -
 drivers/leds/rgb/leds-pwm-multicolor.c                        | 1 -
 drivers/mailbox/mailbox-mpfs.c                                | 1 -
 drivers/mailbox/platform_mhu.c                                | 1 -
 drivers/media/cec/platform/cros-ec/cros-ec-cec.c              | 1 -
 drivers/media/firewire/firedtv-fw.c                           | 1 -
 drivers/media/i2c/adv7180.c                                   | 1 -
 drivers/media/i2c/cvs/core.c                                  | 1 -
 drivers/media/i2c/gc0308.c                                    | 1 -
 drivers/media/i2c/gc05a2.c                                    | 1 -
 drivers/media/i2c/gc08a3.c                                    | 1 -
 drivers/media/i2c/lm3560.c                                    | 1 -
 drivers/media/i2c/mt9m114.c                                   | 1 -
 drivers/media/i2c/mt9p031.c                                   | 1 -
 drivers/media/i2c/mt9v032.c                                   | 1 -
 drivers/media/i2c/ov2680.c                                    | 1 -
 drivers/media/i2c/ov5640.c                                    | 1 -
 drivers/media/i2c/ov5670.c                                    | 1 -
 drivers/media/i2c/ov5675.c                                    | 1 -
 drivers/media/i2c/ov64a40.c                                   | 1 -
 drivers/media/i2c/ov7251.c                                    | 1 -
 drivers/media/i2c/ov7670.c                                    | 1 -
 drivers/media/i2c/ov8865.c                                    | 1 -
 drivers/media/i2c/t4ka3.c                                     | 1 -
 drivers/media/i2c/tvp514x.c                                   | 1 -
 drivers/media/i2c/video-i2c.c                                 | 1 -
 drivers/media/platform/arm/mali-c55/mali-c55-core.c           | 1 -
 drivers/media/platform/chips-media/coda/imx-vdoa.c            | 1 -
 drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c        | 1 -
 drivers/media/platform/microchip/microchip-csi2dc.c           | 1 -
 drivers/media/platform/qcom/venus/vdec.c                      | 1 -
 drivers/media/platform/qcom/venus/venc.c                      | 1 -
 drivers/media/platform/renesas/rcar-fcp.c                     | 1 -
 drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c         | 1 -
 drivers/media/platform/st/sti/hva/hva-v4l2.c                  | 1 -
 drivers/media/platform/sunxi/sun8i-di/sun8i-di.c              | 1 -
 drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c      | 1 -
 drivers/media/rc/ir-spi.c                                     | 1 -
 drivers/memory/stm32_omm.c                                    | 1 -
 drivers/memory/tegra/tegra186-emc.c                           | 1 -
 drivers/memory/tegra/tegra186.c                               | 1 -
 drivers/memory/tegra/tegra210-emc-core.c                      | 1 -
 drivers/mfd/adp5585.c                                         | 1 -
 drivers/mfd/atmel-hlcdc.c                                     | 1 -
 drivers/mfd/atmel-smc.c                                       | 1 -
 drivers/mfd/cros_ec_dev.c                                     | 1 -
 drivers/mfd/cs42l43-i2c.c                                     | 1 -
 drivers/mfd/cs42l43-sdw.c                                     | 1 -
 drivers/mfd/hi655x-pmic.c                                     | 1 -
 drivers/mfd/intel-lpss-acpi.c                                 | 1 -
 drivers/mfd/intel-lpss-pci.c                                  | 1 -
 drivers/mfd/intel_soc_pmic_bxtwc.c                            | 1 -
 drivers/mfd/intel_soc_pmic_crc.c                              | 1 -
 drivers/mfd/kempld-core.c                                     | 1 -
 drivers/mfd/lochnagar-i2c.c                                   | 1 -
 drivers/mfd/lp873x.c                                          | 2 +-
 drivers/mfd/lp87565.c                                         | 1 -
 drivers/mfd/max14577.c                                        | 1 -
 drivers/mfd/max7360.c                                         | 1 -
 drivers/mfd/max77759.c                                        | 1 -
 drivers/mfd/max77843.c                                        | 1 -
 drivers/mfd/mc13xxx-spi.c                                     | 1 -
 drivers/mfd/motorola-cpcap.c                                  | 1 -
 drivers/mfd/ocelot-spi.c                                      | 1 -
 drivers/mfd/rt5033.c                                          | 3 ++-
 drivers/mfd/rt5120.c                                          | 1 -
 drivers/mfd/rz-mtu3.c                                         | 1 -
 drivers/mfd/sec-acpm.c                                        | 1 -
 drivers/mfd/sec-i2c.c                                         | 1 -
 drivers/mfd/simple-mfd-i2c.c                                  | 1 -
 drivers/mfd/tps6594-i2c.c                                     | 1 -
 drivers/mfd/tps6594-spi.c                                     | 1 -
 drivers/mfd/upboard-fpga.c                                    | 1 -
 drivers/mfd/wm831x-core.c                                     | 2 +-
 drivers/misc/eeprom/at24.c                                    | 1 -
 drivers/misc/eeprom/ee1004.c                                  | 1 -
 drivers/misc/eeprom/eeprom_93xx46.c                           | 1 -
 drivers/misc/eeprom/idt_89hpesx.c                             | 1 -
 drivers/misc/hisi_hikey_usb.c                                 | 1 -
 drivers/misc/pvpanic/pvpanic-mmio.c                           | 1 -
 drivers/misc/pvpanic/pvpanic.c                                | 1 -
 drivers/misc/smpro-errmon.c                                   | 1 -
 drivers/misc/smpro-misc.c                                     | 1 -
 drivers/mmc/host/litex_mmc.c                                  | 1 -
 drivers/mmc/host/owl-mmc.c                                    | 1 -
 drivers/mmc/host/renesas_sdhi_internal_dmac.c                 | 1 -
 drivers/mmc/host/renesas_sdhi_sys_dmac.c                      | 1 -
 drivers/mmc/host/sdhci-npcm.c                                 | 1 -
 drivers/mmc/host/sdhci-of-ma35d1.c                            | 1 -
 drivers/mmc/host/sh_mmcif.c                                   | 1 -
 drivers/mmc/host/sunxi-mmc.c                                  | 1 -
 drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c                  | 1 -
 drivers/mux/adgs1408.c                                        | 1 -
 drivers/mux/gpio.c                                            | 1 -
 drivers/net/can/spi/hi311x.c                                  | 1 -
 drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c                | 1 -
 drivers/net/dsa/microchip/ksz8863_smi.c                       | 2 +-
 drivers/net/dsa/mt7530-mmio.c                                 | 1 -
 drivers/net/dsa/ocelot/seville_vsc9953.c                      | 1 -
 drivers/net/ethernet/calxeda/xgmac.c                          | 1 -
 drivers/net/ethernet/ezchip/nps_enet.c                        | 1 -
 drivers/net/ethernet/faraday/ftmac100.c                       | 1 -
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c                | 1 -
 drivers/net/ethernet/freescale/enetc/enetc_ierb.c             | 1 -
 drivers/net/ethernet/ibm/emac/tah.c                           | 1 -
 drivers/net/ethernet/ibm/emac/zmii.c                          | 1 -
 drivers/net/ethernet/marvell/mvmdio.c                         | 1 -
 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c    | 1 -
 drivers/net/ethernet/mellanox/mlxsw/i2c.c                     | 1 -
 drivers/net/ethernet/mellanox/mlxsw/minimal.c                 | 1 -
 drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c           | 1 -
 drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c            | 1 -
 drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c          | 1 -
 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c          | 1 -
 drivers/net/ethernet/xscale/ptp_ixp46x.c                      | 1 -
 drivers/net/ieee802154/mrf24j40.c                             | 1 -
 drivers/net/mdio/mdio-realtek-rtl9300.c                       | 1 -
 drivers/net/mhi_net.c                                         | 1 -
 drivers/net/wan/fsl_qmc_hdlc.c                                | 1 -
 drivers/net/wireless/ath/ath9k/ahb.c                          | 1 -
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c        | 1 -
 drivers/net/wireless/intersil/p54/p54spi.c                    | 1 -
 drivers/net/wireless/ti/wl1251/sdio.c                         | 1 -
 drivers/net/wireless/ti/wl12xx/main.c                         | 1 -
 drivers/net/wireless/ti/wl18xx/main.c                         | 1 -
 drivers/net/wwan/mhi_wwan_ctrl.c                              | 1 -
 drivers/net/wwan/mhi_wwan_mbim.c                              | 1 -
 drivers/net/wwan/qcom_bam_dmux.c                              | 1 -
 drivers/net/wwan/rpmsg_wwan_ctrl.c                            | 1 -
 drivers/nfc/microread/mei.c                                   | 1 -
 drivers/nfc/pn544/mei.c                                       | 1 -
 drivers/nfc/s3fwrn5/uart.c                                    | 1 -
 drivers/nvmem/an8855-efuse.c                                  | 1 -
 drivers/nvmem/apple-efuses.c                                  | 1 -
 drivers/nvmem/brcm_nvram.c                                    | 1 -
 drivers/nvmem/layerscape-sfp.c                                | 1 -
 drivers/nvmem/lpc18xx_eeprom.c                                | 1 -
 drivers/nvmem/max77759-nvmem.c                                | 1 -
 drivers/nvmem/mtk-efuse.c                                     | 1 -
 drivers/nvmem/nintendo-otp.c                                  | 1 -
 drivers/nvmem/qfprom.c                                        | 1 -
 drivers/nvmem/qoriq-efuse.c                                   | 1 -
 drivers/nvmem/rcar-efuse.c                                    | 1 -
 drivers/nvmem/sec-qfprom.c                                    | 1 -
 drivers/nvmem/sunplus-ocotp.c                                 | 1 -
 drivers/nvmem/u-boot-env.c                                    | 1 -
 drivers/nvmem/uniphier-efuse.c                                | 1 -
 drivers/of/device.c                                           | 1 -
 drivers/pci/controller/cadence/pcie-sg2042.c                  | 1 -
 drivers/pci/controller/dwc/pci-exynos.c                       | 1 -
 drivers/pci/controller/dwc/pci-meson.c                        | 1 -
 drivers/pci/controller/dwc/pcie-intel-gw.c                    | 1 -
 drivers/pci/controller/dwc/pcie-keembay.c                     | 1 -
 drivers/pci/controller/dwc/pcie-spacemit-k1.c                 | 1 -
 drivers/pci/controller/dwc/pcie-stm32.c                       | 1 -
 drivers/pci/pwrctrl/generic.c                                 | 1 -
 drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c                      | 1 -
 drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c                      | 1 -
 drivers/perf/arm-ccn.c                                        | 1 -
 drivers/perf/fujitsu_uncore_pmu.c                             | 1 -
 drivers/perf/hisilicon/hisi_uncore_mn_pmu.c                   | 1 -
 drivers/perf/hisilicon/hisi_uncore_noc_pmu.c                  | 1 -
 drivers/perf/hisilicon/hisi_uncore_uc_pmu.c                   | 1 -
 drivers/perf/riscv_pmu_legacy.c                               | 1 -
 drivers/perf/riscv_pmu_sbi.c                                  | 1 -
 drivers/perf/starfive_starlink_pmu.c                          | 1 -
 drivers/phy/allwinner/phy-sun50i-usb3.c                       | 1 -
 drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c                 | 1 -
 drivers/phy/amlogic/phy-meson-axg-pcie.c                      | 1 -
 drivers/phy/amlogic/phy-meson-gxl-usb2.c                      | 1 -
 drivers/phy/amlogic/phy-meson8b-usb2.c                        | 1 -
 drivers/phy/cadence/cdns-dphy-rx.c                            | 1 -
 drivers/phy/hisilicon/phy-hi3670-pcie.c                       | 1 -
 drivers/phy/hisilicon/phy-hi6220-usb.c                        | 1 -
 drivers/phy/intel/phy-intel-keembay-usb.c                     | 1 -
 drivers/phy/marvell/phy-mmp3-hsic.c                           | 1 -
 drivers/phy/marvell/phy-mmp3-usb.c                            | 1 -
 drivers/phy/marvell/phy-mvebu-sata.c                          | 1 -
 drivers/phy/mediatek/phy-mtk-ufs.c                            | 1 -
 drivers/phy/phy-snps-eusb2.c                                  | 1 -
 drivers/phy/qualcomm/phy-ath79-usb.c                          | 1 -
 drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c             | 1 -
 drivers/phy/rockchip/phy-rockchip-usbdp.c                     | 1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c                    | 1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c                    | 1 -
 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c                    | 1 -
 drivers/pinctrl/bcm/pinctrl-bcm4908.c                         | 1 -
 drivers/pinctrl/bcm/pinctrl-bcm63xx.c                         | 1 -
 drivers/pinctrl/freescale/pinctrl-imx-scmi.c                  | 1 -
 drivers/pinctrl/freescale/pinctrl-imx23.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx25.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx27.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx28.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx35.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx50.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx51.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx53.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx6dl.c                    | 1 -
 drivers/pinctrl/freescale/pinctrl-imx6q.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx6sl.c                    | 1 -
 drivers/pinctrl/freescale/pinctrl-imx6sll.c                   | 1 -
 drivers/pinctrl/freescale/pinctrl-imx6sx.c                    | 1 -
 drivers/pinctrl/freescale/pinctrl-imx7ulp.c                   | 1 -
 drivers/pinctrl/freescale/pinctrl-imx8dxl.c                   | 1 -
 drivers/pinctrl/freescale/pinctrl-imx8mq.c                    | 1 -
 drivers/pinctrl/freescale/pinctrl-imx8qxp.c                   | 1 -
 drivers/pinctrl/freescale/pinctrl-imx8ulp.c                   | 1 -
 drivers/pinctrl/freescale/pinctrl-imx91.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-imx93.c                     | 1 -
 drivers/pinctrl/freescale/pinctrl-vf610.c                     | 1 -
 drivers/pinctrl/intel/pinctrl-alderlake.c                     | 1 -
 drivers/pinctrl/intel/pinctrl-broxton.c                       | 1 -
 drivers/pinctrl/intel/pinctrl-cannonlake.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-cedarfork.c                     | 1 -
 drivers/pinctrl/intel/pinctrl-denverton.c                     | 1 -
 drivers/pinctrl/intel/pinctrl-elkhartlake.c                   | 1 -
 drivers/pinctrl/intel/pinctrl-emmitsburg.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-geminilake.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-intel-platform.c                | 1 -
 drivers/pinctrl/intel/pinctrl-jasperlake.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-lakefield.c                     | 1 -
 drivers/pinctrl/intel/pinctrl-lewisburg.c                     | 1 -
 drivers/pinctrl/intel/pinctrl-merrifield.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-meteorlake.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-meteorpoint.c                   | 1 -
 drivers/pinctrl/intel/pinctrl-moorefield.c                    | 1 -
 drivers/pinctrl/intel/pinctrl-sunrisepoint.c                  | 1 -
 drivers/pinctrl/intel/pinctrl-tigerlake.c                     | 1 -
 drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c               | 1 -
 drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c                | 1 -
 drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c             | 1 -
 drivers/pinctrl/nuvoton/pinctrl-ma35d1.c                      | 1 -
 drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c                     | 1 -
 drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c                     | 1 -
 drivers/pinctrl/nuvoton/pinctrl-wpcm450.c                     | 1 -
 drivers/pinctrl/pinctrl-as3722.c                              | 1 -
 drivers/pinctrl/pinctrl-cy8c95x0.c                            | 1 -
 drivers/pinctrl/pinctrl-da850-pupd.c                          | 1 -
 drivers/pinctrl/pinctrl-digicolor.c                           | 1 -
 drivers/pinctrl/pinctrl-eic7700.c                             | 1 -
 drivers/pinctrl/pinctrl-eyeq5.c                               | 1 -
 drivers/pinctrl/pinctrl-ingenic.c                             | 1 -
 drivers/pinctrl/pinctrl-loongson2.c                           | 1 -
 drivers/pinctrl/pinctrl-lpc18xx.c                             | 1 -
 drivers/pinctrl/pinctrl-max77620.c                            | 1 -
 drivers/pinctrl/pinctrl-mcp23s08.c                            | 1 -
 drivers/pinctrl/pinctrl-mcp23s08_i2c.c                        | 1 -
 drivers/pinctrl/pinctrl-mcp23s08_spi.c                        | 1 -
 drivers/pinctrl/pinctrl-microchip-sgpio.c                     | 1 -
 drivers/pinctrl/pinctrl-mlxbf3.c                              | 1 -
 drivers/pinctrl/pinctrl-pistachio.c                           | 1 -
 drivers/pinctrl/pinctrl-scmi.c                                | 1 -
 drivers/pinctrl/pinctrl-th1520.c                              | 1 -
 drivers/pinctrl/pinctrl-tps6594.c                             | 1 -
 drivers/pinctrl/qcom/pinctrl-ipq5018.c                        | 1 -
 drivers/pinctrl/spear/pinctrl-spear1310.c                     | 1 -
 drivers/pinctrl/spear/pinctrl-spear1340.c                     | 1 -
 drivers/pinctrl/spear/pinctrl-spear300.c                      | 1 -
 drivers/pinctrl/spear/pinctrl-spear310.c                      | 1 -
 drivers/pinctrl/spear/pinctrl-spear320.c                      | 1 -
 drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c                    | 1 -
 drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c            | 1 -
 drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c        | 1 -
 drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c        | 1 -
 drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c            | 1 -
 drivers/pinctrl/tegra/pinctrl-tegra234.c                      | 1 -
 drivers/pinctrl/tegra/pinctrl-tegra238.c                      | 1 -
 drivers/pinctrl/tegra/pinctrl-tegra264.c                      | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c               | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c               | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c              | 1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c              | 1 -
 drivers/platform/chrome/cros_ec_chardev.c                     | 1 -
 drivers/platform/chrome/cros_ec_debugfs.c                     | 1 -
 drivers/platform/chrome/cros_ec_lightbar.c                    | 1 -
 drivers/platform/chrome/cros_ec_sensorhub.c                   | 1 -
 drivers/platform/chrome/cros_ec_sysfs.c                       | 1 -
 drivers/platform/chrome/cros_ec_vbc.c                         | 1 -
 drivers/platform/chrome/cros_kbd_led_backlight.c              | 1 -
 drivers/platform/chrome/cros_usbpd_logger.c                   | 1 -
 drivers/platform/chrome/cros_usbpd_notify.c                   | 1 -
 drivers/platform/chrome/wilco_ec/core.c                       | 1 -
 drivers/platform/chrome/wilco_ec/debugfs.c                    | 1 -
 drivers/platform/chrome/wilco_ec/telemetry.c                  | 1 -
 drivers/platform/goldfish/goldfish_pipe.c                     | 1 -
 drivers/platform/x86/asus-tf103c-dock.c                       | 1 -
 drivers/platform/x86/intel/atomisp2/led.c                     | 1 -
 drivers/platform/x86/intel/atomisp2/pm.c                      | 1 -
 drivers/platform/x86/intel/bxtwc_tmu.c                        | 1 -
 drivers/platform/x86/intel/ehl_pse_io.c                       | 1 -
 drivers/platform/x86/intel/plr_tpmi.c                         | 1 -
 drivers/platform/x86/intel/punit_ipc.c                        | 1 -
 drivers/platform/x86/intel_scu_pltdrv.c                       | 1 -
 drivers/platform/x86/nvidia-wmi-ec-backlight.c                | 1 -
 drivers/platform/x86/quickstart.c                             | 1 -
 drivers/platform/x86/uniwill/uniwill-wmi.c                    | 1 -
 drivers/platform/x86/x86-android-tablets/dmi.c                | 1 -
 drivers/pmdomain/actions/owl-sps.c                            | 1 -
 drivers/pmdomain/imx/imx93-pd.c                               | 1 -
 drivers/pmdomain/marvell/pxa1908-power-controller.c           | 1 -
 drivers/pnp/pnpacpi/core.c                                    | 1 -
 drivers/power/reset/brcm-kona-reset.c                         | 1 -
 drivers/power/reset/ep93xx-restart.c                          | 1 -
 drivers/power/reset/gpio-poweroff.c                           | 1 -
 drivers/power/reset/ltc2952-poweroff.c                        | 1 -
 drivers/power/reset/macsmc-reboot.c                           | 1 -
 drivers/power/reset/ocelot-reset.c                            | 1 -
 drivers/power/reset/pwr-mlxbf.c                               | 1 -
 drivers/power/reset/qemu-virt-ctrl.c                          | 1 -
 drivers/power/reset/sc27xx-poweroff.c                         | 1 -
 drivers/power/reset/spacemit-p1-reboot.c                      | 1 -
 drivers/power/reset/tdx-ec-poweroff.c                         | 1 -
 drivers/power/reset/tps65086-restart.c                        | 1 -
 drivers/power/sequencing/pwrseq-pcie-m2.c                     | 1 -
 drivers/power/sequencing/pwrseq-qcom-wcn.c                    | 1 -
 drivers/power/supply/adp5061.c                                | 1 -
 drivers/power/supply/bd71828-power.c                          | 1 -
 drivers/power/supply/bd99954-charger.c                        | 1 -
 drivers/power/supply/bq24190_charger.c                        | 1 -
 drivers/power/supply/chagall-battery.c                        | 1 -
 drivers/power/supply/cpcap-charger.c                          | 1 -
 drivers/power/supply/cros_charge-control.c                    | 1 -
 drivers/power/supply/cros_peripheral_charger.c                | 1 -
 drivers/power/supply/cros_usbpd-charger.c                     | 1 -
 drivers/power/supply/lego_ev3_battery.c                       | 1 -
 drivers/power/supply/max14656_charger_detector.c              | 1 -
 drivers/power/supply/max17042_battery.c                       | 1 -
 drivers/power/supply/max77759_charger.c                       | 1 -
 drivers/power/supply/max8971_charger.c                        | 1 -
 drivers/power/supply/max8998_charger.c                        | 1 -
 drivers/power/supply/mp2629_charger.c                         | 1 -
 drivers/power/supply/olpc_battery.c                           | 1 -
 drivers/power/supply/pm8916_bms_vm.c                          | 1 -
 drivers/power/supply/pm8916_lbc.c                             | 1 -
 drivers/power/supply/rt5033_charger.c                         | 1 -
 drivers/power/supply/rt9467-charger.c                         | 1 -
 drivers/power/supply/rt9471.c                                 | 1 -
 drivers/power/supply/rt9756.c                                 | 1 -
 drivers/power/supply/s2mu005-battery.c                        | 1 -
 drivers/power/supply/ug3105_battery.c                         | 1 -
 drivers/pps/clients/pps-gpio.c                                | 1 -
 drivers/pps/generators/pps_gen_tio.c                          | 1 -
 drivers/ptp/ptp_dte.c                                         | 1 -
 drivers/pwm/pwm-adp5585.c                                     | 1 -
 drivers/pwm/pwm-airoha.c                                      | 1 -
 drivers/pwm/pwm-apple.c                                       | 1 -
 drivers/pwm/pwm-berlin.c                                      | 1 -
 drivers/pwm/pwm-ep93xx.c                                      | 1 -
 drivers/pwm/pwm-gpio.c                                        | 1 -
 drivers/pwm/pwm-intel-lgm.c                                   | 1 -
 drivers/pwm/pwm-keembay.c                                     | 1 -
 drivers/pwm/pwm-lpc18xx-sct.c                                 | 1 -
 drivers/pwm/pwm-lpss-platform.c                               | 1 -
 drivers/pwm/pwm-max7360.c                                     | 1 -
 drivers/pwm/pwm-pxa.c                                         | 1 -
 drivers/pwm/pwm-sifive.c                                      | 1 -
 drivers/pwm/pwm-sl28cpld.c                                    | 1 -
 drivers/pwm/pwm-sprd.c                                        | 1 -
 drivers/pwm/pwm-sunplus.c                                     | 1 -
 drivers/pwm/pwm-vt8500.c                                      | 1 -
 drivers/regulator/adp5055-regulator.c                         | 1 -
 drivers/regulator/bd71828-regulator.c                         | 1 -
 drivers/regulator/max77541-regulator.c                        | 1 -
 drivers/regulator/max77675-regulator.c                        | 1 -
 drivers/regulator/mt6370-regulator.c                          | 1 -
 drivers/regulator/pv88080-regulator.c                         | 1 -
 drivers/regulator/rt4803.c                                    | 1 -
 drivers/regulator/rt5739.c                                    | 1 -
 drivers/regulator/rt6190-regulator.c                          | 1 -
 drivers/regulator/rt8092.c                                    | 1 -
 drivers/regulator/rtq2208-regulator.c                         | 1 -
 drivers/regulator/tps6287x-regulator.c                        | 1 -
 drivers/regulator/tps65218-regulator.c                        | 1 -
 drivers/regulator/tps65912-regulator.c                        | 1 -
 drivers/regulator/vexpress-regulator.c                        | 1 -
 drivers/reset/reset-ath79.c                                   | 1 -
 drivers/reset/reset-axs10x.c                                  | 1 -
 drivers/reset/reset-bcm6345.c                                 | 1 -
 drivers/reset/reset-eyeq.c                                    | 1 -
 drivers/reset/reset-gpio.c                                    | 1 -
 drivers/reset/reset-sunplus.c                                 | 1 -
 drivers/reset/reset-tn48m.c                                   | 1 -
 drivers/reset/starfive/reset-starfive-jh7100.c                | 1 -
 drivers/rtc/rtc-88pm886.c                                     | 1 -
 drivers/rtc/rtc-cpcap.c                                       | 1 -
 drivers/rtc/rtc-cros-ec.c                                     | 1 -
 drivers/rtc/rtc-ds1307.c                                      | 1 -
 drivers/rtc/rtc-ep93xx.c                                      | 1 -
 drivers/rtc/rtc-fsl-ftm-alarm.c                               | 1 -
 drivers/rtc/rtc-ftrtc010.c                                    | 1 -
 drivers/rtc/rtc-lpc24xx.c                                     | 1 -
 drivers/rtc/rtc-m48t86.c                                      | 1 -
 drivers/rtc/rtc-mc13xxx.c                                     | 1 -
 drivers/rtc/rtc-moxart.c                                      | 1 -
 drivers/rtc/rtc-msc313.c                                      | 1 -
 drivers/rtc/rtc-mt6397.c                                      | 1 -
 drivers/rtc/rtc-mt7622.c                                      | 1 -
 drivers/rtc/rtc-mxc_v2.c                                      | 1 -
 drivers/rtc/rtc-r7301.c                                       | 1 -
 drivers/rtc/rtc-rzn1.c                                        | 1 -
 drivers/rtc/rtc-sh.c                                          | 1 -
 drivers/rtc/rtc-ssd202d.c                                     | 1 -
 drivers/rtc/rtc-tegra.c                                       | 1 -
 drivers/rtc/rtc-ti-k3.c                                       | 1 -
 drivers/rtc/rtc-tps6594.c                                     | 1 -
 drivers/s390/crypto/ap_bus.c                                  | 2 +-
 drivers/s390/crypto/vfio_ap_drv.c                             | 2 +-
 drivers/s390/crypto/zcrypt_cex4.c                             | 2 +-
 drivers/siox/siox-bus-gpio.c                                  | 1 -
 drivers/soc/fsl/qe/qe.c                                       | 1 -
 drivers/soc/qcom/qcom_pd_mapper.c                             | 1 -
 drivers/soc/renesas/rzn1_irqmux.c                             | 1 -
 drivers/soc/sophgo/sg2044-topsys.c                            | 2 +-
 drivers/soc/tegra/fuse/fuse-tegra.c                           | 1 -
 drivers/soc/tegra/fuse/tegra-apbmisc.c                        | 1 -
 drivers/soc/ti/smartreflex.c                                  | 2 +-
 drivers/soundwire/bus.c                                       | 1 -
 drivers/soundwire/bus_type.c                                  | 1 -
 drivers/soundwire/cadence_master.c                            | 1 -
 drivers/soundwire/debugfs.c                                   | 1 -
 drivers/soundwire/generic_bandwidth_allocation.c              | 1 -
 drivers/soundwire/mipi_disco.c                                | 1 -
 drivers/soundwire/stream.c                                    | 1 -
 drivers/soundwire/sysfs_slave.c                               | 1 -
 drivers/soundwire/sysfs_slave_dpn.c                           | 1 -
 drivers/spi/spi-atcspi200.c                                   | 1 -
 drivers/spi/spi-cs42l43.c                                     | 1 -
 drivers/spi/spi-gpio.c                                        | 1 -
 drivers/spi/spi-hisi-sfc-v3xx.c                               | 1 -
 drivers/spi/spi-loongson-pci.c                                | 1 -
 drivers/spi/spi-loongson-plat.c                               | 1 -
 drivers/spi/spi-loopback-test.c                               | 1 -
 drivers/spi/spi-offload-trigger-adi-util-sigma-delta.c        | 1 -
 drivers/spi/spi-offload-trigger-pwm.c                         | 1 -
 drivers/spi/spi-pxa2xx-platform.c                             | 1 -
 drivers/spi/spi-realtek-rtl-snand.c                           | 1 -
 drivers/spi/spi-realtek-rtl.c                                 | 1 -
 drivers/spi/spi-sc18is602.c                                   | 1 -
 drivers/spi/spi-wpcm-fiu.c                                    | 1 -
 drivers/spi/spi.c                                             | 1 -
 drivers/spi/spidev.c                                          | 1 -
 drivers/spmi/spmi-apple-controller.c                          | 1 -
 drivers/staging/greybus/arche-apb-ctrl.c                      | 1 -
 drivers/thermal/loongson2_thermal.c                           | 1 -
 drivers/thermal/renesas/rzg2l_thermal.c                       | 1 -
 drivers/tty/goldfish.c                                        | 1 -
 drivers/tty/serial/8250/8250_dfl.c                            | 1 -
 drivers/tty/serial/8250/8250_dw.c                             | 1 -
 drivers/tty/serial/8250/8250_em.c                             | 1 -
 drivers/tty/serial/8250/8250_keba.c                           | 1 -
 drivers/tty/serial/8250/8250_loongson.c                       | 1 -
 drivers/tty/serial/8250/8250_ni.c                             | 1 -
 drivers/tty/serial/max3100.c                                  | 1 -
 drivers/tty/serial/max310x.c                                  | 1 -
 drivers/tty/serial/sc16is7xx.c                                | 1 -
 drivers/tty/serial/sc16is7xx_i2c.c                            | 1 -
 drivers/tty/serial/sc16is7xx_spi.c                            | 1 -
 drivers/tty/serial/sccnxp.c                                   | 1 -
 drivers/tty/serial/tegra-utc.c                                | 1 -
 drivers/uio/uio_pdrv_genirq.c                                 | 1 -
 drivers/usb/gadget/udc/renesas_usbf.c                         | 1 -
 drivers/usb/misc/usb-ljca.c                                   | 1 -
 drivers/usb/typec/mux/tusb1046.c                              | 1 -
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c                 | 1 -
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c           | 1 -
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c      | 1 -
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c            | 1 -
 drivers/usb/typec/tcpm/tcpci_mt6370.c                         | 1 -
 drivers/usb/typec/tcpm/tcpci_rt1711h.c                        | 1 -
 drivers/usb/typec/ucsi/cros_ec_ucsi.c                         | 1 -
 drivers/vdpa/vdpa.c                                           | 1 -
 drivers/vdpa/vdpa_user/vduse_dev.c                            | 1 -
 drivers/video/backlight/apple_dwi_bl.c                        | 1 -
 drivers/video/backlight/da9052_bl.c                           | 1 -
 drivers/video/backlight/hx8357.c                              | 1 -
 drivers/video/backlight/ktd2801-backlight.c                   | 1 -
 drivers/video/backlight/mp3309c.c                             | 1 -
 drivers/video/backlight/mt6370-backlight.c                    | 1 -
 drivers/video/backlight/rave-sp-backlight.c                   | 1 -
 drivers/video/backlight/rt4831-backlight.c                    | 1 -
 drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c    | 1 -
 drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c    | 1 -
 drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c | 1 -
 drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c      | 1 -
 drivers/virt/coco/arm-cca-guest/arm-cca-guest.c               | 2 +-
 drivers/virt/coco/tdx-guest/tdx-guest.c                       | 1 -
 drivers/virt/coco/tdx-host/tdx-host.c                         | 1 -
 drivers/w1/masters/amd_axi_w1.c                               | 1 -
 drivers/w1/masters/ds2490.c                                   | 1 -
 drivers/w1/masters/mxc_w1.c                                   | 1 -
 drivers/w1/masters/sgi_w1.c                                   | 1 -
 drivers/w1/masters/w1-gpio.c                                  | 1 -
 drivers/watchdog/at91rm9200_wdt.c                             | 1 -
 drivers/watchdog/cros_ec_wdt.c                                | 1 -
 drivers/watchdog/davinci_wdt.c                                | 1 -
 drivers/watchdog/ftwdt010_wdt.c                               | 1 -
 drivers/watchdog/gpio_wdt.c                                   | 1 -
 drivers/watchdog/gunyah_wdt.c                                 | 1 -
 drivers/watchdog/imgpdc_wdt.c                                 | 1 -
 drivers/watchdog/keembay_wdt.c                                | 1 -
 drivers/watchdog/max63xx_wdt.c                                | 1 -
 drivers/watchdog/max77620_wdt.c                               | 1 -
 drivers/watchdog/meson_wdt.c                                  | 1 -
 drivers/watchdog/moxart_wdt.c                                 | 1 -
 drivers/watchdog/msc313e_wdt.c                                | 1 -
 drivers/watchdog/mt7621_wdt.c                                 | 1 -
 drivers/watchdog/nic7018_wdt.c                                | 1 -
 drivers/watchdog/omap_wdt.c                                   | 1 -
 drivers/watchdog/pseries-wdt.c                                | 1 -
 drivers/watchdog/realtek_otto_wdt.c                           | 1 -
 drivers/watchdog/rt2880_wdt.c                                 | 1 -
 drivers/watchdog/rti_wdt.c                                    | 1 -
 drivers/watchdog/sbsa_gwdt.c                                  | 1 -
 drivers/watchdog/sl28cpld_wdt.c                               | 1 -
 drivers/watchdog/sunplus_wdt.c                                | 1 -
 drivers/watchdog/ts72xx_wdt.c                                 | 1 -
 drivers/watchdog/twl4030_wdt.c                                | 1 -
 drivers/watchdog/xilinx_wwdt.c                                | 1 -
 net/qrtr/mhi.c                                                | 1 -
 net/rfkill/rfkill-gpio.c                                      | 1 -
 sound/atmel/ac97c.c                                           | 1 -
 sound/firewire/isight.c                                       | 1 -
 sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c                | 1 -
 sound/hda/codecs/side-codecs/cs35l41_hda_spi.c                | 1 -
 sound/hda/codecs/side-codecs/tas2781_hda_i2c.c                | 1 -
 sound/hda/codecs/side-codecs/tas2781_hda_spi.c                | 1 -
 sound/hda/core/hda_bus_type.c                                 | 2 +-
 sound/soc/atmel/sam9x5_wm8731.c                               | 1 -
 sound/soc/codecs/adau1372-i2c.c                               | 1 -
 sound/soc/codecs/adau1372-spi.c                               | 1 -
 sound/soc/codecs/adau1372.c                                   | 1 -
 sound/soc/codecs/adau1761-i2c.c                               | 1 -
 sound/soc/codecs/adau1761-spi.c                               | 1 -
 sound/soc/codecs/adau1781-i2c.c                               | 1 -
 sound/soc/codecs/adau1781-spi.c                               | 1 -
 sound/soc/codecs/adau1977-i2c.c                               | 1 -
 sound/soc/codecs/adau1977-spi.c                               | 1 -
 sound/soc/codecs/adau7118-hw.c                                | 1 -
 sound/soc/codecs/ak4104.c                                     | 1 -
 sound/soc/codecs/audio-iio-aux.c                              | 1 -
 sound/soc/codecs/cs4234.c                                     | 1 -
 sound/soc/codecs/cs4270.c                                     | 1 -
 sound/soc/codecs/cs42l42-sdw.c                                | 1 -
 sound/soc/codecs/cs42l43.c                                    | 1 -
 sound/soc/codecs/cs42xx8-i2c.c                                | 1 -
 sound/soc/codecs/cs42xx8-spi.c                                | 1 -
 sound/soc/codecs/cs4349.c                                     | 1 -
 sound/soc/codecs/es8316.c                                     | 1 -
 sound/soc/codecs/es8323.c                                     | 1 -
 sound/soc/codecs/es9356.c                                     | 1 -
 sound/soc/codecs/max98357a.c                                  | 1 -
 sound/soc/codecs/max98373-i2c.c                               | 1 -
 sound/soc/codecs/max98373-sdw.c                               | 1 -
 sound/soc/codecs/max98388.c                                   | 1 -
 sound/soc/codecs/mt6351.c                                     | 1 -
 sound/soc/codecs/mt6358.c                                     | 1 -
 sound/soc/codecs/pcm3168a-i2c.c                               | 1 -
 sound/soc/codecs/rt1017-sdca-sdw.c                            | 1 -
 sound/soc/codecs/rt1308-sdw.c                                 | 1 -
 sound/soc/codecs/rt1316-sdw.c                                 | 1 -
 sound/soc/codecs/rt1318-sdw.c                                 | 1 -
 sound/soc/codecs/rt1320-sdw.c                                 | 1 -
 sound/soc/codecs/rt700-sdw.c                                  | 1 -
 sound/soc/codecs/rt711-sdca-sdw.c                             | 1 -
 sound/soc/codecs/rt711-sdw.c                                  | 1 -
 sound/soc/codecs/rt712-sdca-dmic.c                            | 1 -
 sound/soc/codecs/rt712-sdca-sdw.c                             | 1 -
 sound/soc/codecs/rt715-sdca-sdw.c                             | 1 -
 sound/soc/codecs/rt715-sdw.c                                  | 1 -
 sound/soc/codecs/rt721-sdca-sdw.c                             | 1 -
 sound/soc/codecs/rt722-sdca-sdw.c                             | 1 -
 sound/soc/codecs/rt9123.c                                     | 1 -
 sound/soc/codecs/rt9123p.c                                    | 1 -
 sound/soc/codecs/rtq9124.c                                    | 1 -
 sound/soc/codecs/rtq9128.c                                    | 1 -
 sound/soc/codecs/sdw-mockup.c                                 | 1 -
 sound/soc/codecs/simple-amplifier.c                           | 1 -
 sound/soc/codecs/sma1303.c                                    | 1 -
 sound/soc/codecs/src4xxx-i2c.c                                | 1 -
 sound/soc/codecs/uda1334.c                                    | 1 -
 sound/soc/codecs/wm8510.c                                     | 1 -
 sound/soc/codecs/wm8523.c                                     | 1 -
 sound/soc/codecs/wm8524.c                                     | 1 -
 sound/soc/codecs/wm8580.c                                     | 1 -
 sound/soc/codecs/wm8711.c                                     | 1 -
 sound/soc/codecs/wm8728.c                                     | 1 -
 sound/soc/codecs/wm8731-i2c.c                                 | 1 -
 sound/soc/codecs/wm8731-spi.c                                 | 1 -
 sound/soc/codecs/wm8737.c                                     | 1 -
 sound/soc/codecs/wm8753.c                                     | 1 -
 sound/soc/codecs/wm8770.c                                     | 1 -
 sound/soc/codecs/wm8776.c                                     | 1 -
 sound/soc/fsl/fsl_aud2htx.c                                   | 1 -
 sound/soc/fsl/mpc5200_psc_ac97.c                              | 1 -
 sound/soc/generic/audio-graph-card2-custom-sample.c           | 1 -
 sound/soc/jz4740/jz4740-i2s.c                                 | 1 -
 sound/soc/mediatek/mt8365/mt8365-mt6357.c                     | 1 -
 sound/soc/qcom/apq8096.c                                      | 1 -
 sound/soc/qcom/sc7280.c                                       | 1 -
 sound/soc/qcom/storm.c                                        | 1 -
 sound/soc/sdca/sdca_class.c                                   | 1 -
 sound/soc/sof/sof-client-ipc-flood-test.c                     | 1 -
 sound/soc/sof/sof-client-ipc-kernel-injector.c                | 1 -
 sound/soc/sof/sof-client-ipc-msg-injector.c                   | 1 -
 sound/soc/sunxi/sun50i-codec-analog.c                         | 1 -
 sound/soc/sunxi/sun50i-dmic.c                                 | 1 -
 sound/soc/tegra/tegra186_asrc.c                               | 1 -
 sound/soc/tegra/tegra186_dspk.c                               | 1 -
 sound/soc/tegra/tegra20_spdif.c                               | 1 -
 sound/soc/tegra/tegra210_adx.c                                | 1 -
 sound/soc/tegra/tegra210_amx.c                                | 1 -
 sound/soc/tegra/tegra210_dmic.c                               | 1 -
 sound/soc/tegra/tegra210_i2s.c                                | 1 -
 sound/soc/tegra/tegra210_mixer.c                              | 1 -
 sound/soc/tegra/tegra210_mvc.c                                | 1 -
 sound/soc/tegra/tegra210_ope.c                                | 1 -
 sound/soc/ti/omap-dmic.c                                      | 1 -
 sound/soc/ti/omap-mcpdm.c                                     | 1 -
 tools/testing/cxl/test/mem.c                                  | 1 -
 1509 files changed, 39 insertions(+), 1509 deletions(-)

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 68e0baad2bbf..bff673e932fe 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -12,7 +12,6 @@
 #include <linux/irqdomain.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
-#include <linux/mod_devicetable.h>
 
 #include <asm/setup.h>
 #include <asm/mach/arch.h>
diff --git a/arch/loongarch/kvm/main.c b/arch/loongarch/kvm/main.c
index aa0fb4c90d90..3e1005526f4b 100644
--- a/arch/loongarch/kvm/main.c
+++ b/arch/loongarch/kvm/main.c
@@ -5,7 +5,7 @@
 
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h> /* for struct cpu_feature */
+#include <linux/mod_devicetable.h>
 #include <linux/kvm_host.h>
 #include <asm/cacheflush.h>
 #include <asm/cpufeature.h>
diff --git a/arch/mips/lantiq/xway/dcdc.c b/arch/mips/lantiq/xway/dcdc.c
index b79c462fd48a..feb73103f009 100644
--- a/arch/mips/lantiq/xway/dcdc.c
+++ b/arch/mips/lantiq/xway/dcdc.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <lantiq_soc.h>
diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c
index cbf0639cb3d6..7714c8ee52c4 100644
--- a/arch/mips/lantiq/xway/gptu.c
+++ b/arch/mips/lantiq/xway/gptu.c
@@ -8,7 +8,6 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 
diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c
index 37c133052ef7..e1a0313298ed 100644
--- a/arch/mips/lantiq/xway/vmmc.c
+++ b/arch/mips/lantiq/xway/vmmc.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/export.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c
index 006e2bbab87e..769c89fe1b40 100644
--- a/arch/mips/pci/pci-rt2880.c
+++ b/arch/mips/pci/pci-rt2880.c
@@ -13,7 +13,6 @@
 #include <linux/pci.h>
 #include <linux/io.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach-ralink/rt288x.h>
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
index 54094f6e033e..06bc2c01420f 100644
--- a/arch/mips/ralink/timer.c
+++ b/arch/mips/ralink/timer.c
@@ -12,7 +12,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/timer.h>
 #include <linux/types.h>
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index c3fbec1f1d24..3908c9b0725c 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
diff --git a/arch/powerpc/platforms/86xx/common.c b/arch/powerpc/platforms/86xx/common.c
index a4a550527609..57cb65be7e0f 100644
--- a/arch/powerpc/platforms/86xx/common.c
+++ b/arch/powerpc/platforms/86xx/common.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_platform.h>
 #include <asm/reg.h>
 #include <asm/synch.h>
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 839cf5adc7d9..eea5ed0ce26e 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -24,7 +24,6 @@
 #include <linux/sched.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/syscore_ops.h>
 #include <asm/fsl_lbc.h>
 
diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c
index 9f6dd11c1344..03955a85bed8 100644
--- a/arch/powerpc/sysdev/fsl_pmc.c
+++ b/arch/powerpc/sysdev/fsl_pmc.c
@@ -13,7 +13,6 @@
 #include <linux/export.h>
 #include <linux/suspend.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 
diff --git a/arch/sh/drivers/platform_early.c b/arch/sh/drivers/platform_early.c
index ca73442a03a6..58b5d0fb230c 100644
--- a/arch/sh/drivers/platform_early.c
+++ b/arch/sh/drivers/platform_early.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include <asm/platform_early.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/platform.h>
 #include <linux/pm.h>
 
 static __initdata LIST_HEAD(sh_early_platform_driver_list);
diff --git a/arch/sparc/crypto/crop_devid.c b/arch/sparc/crypto/crop_devid.c
index 93f4e0fdd38c..109d8a4ef2dd 100644
--- a/arch/sparc/crypto/crop_devid.c
+++ b/arch/sparc/crypto/crop_devid.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 
 /* This is a dummy device table linked into all of the crypto
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index b62b1d0291a4..d18f548bbc20 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -3,7 +3,6 @@
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/irq.h>
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 0b87eb629a62..8c4df33679a1 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -4,7 +4,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/export.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/irq.h>
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index ba2a6ae23508..7f2f9972b59b 100644
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -2,7 +2,6 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/export.h>
-#include <linux/mod_devicetable.h>
 #include <linux/errno.h>
 #include <linux/irq.h>
 #include <linux/of.h>
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 9658ce4e0294..4d2bacd00ec4 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -11,7 +11,6 @@
 #include "pmu.h"
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index f7c2983c533f..e965901b932f 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -20,7 +20,6 @@
 #include <linux/kvm_host.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mm.h>
 #include <linux/objtool.h>
 #include <linux/sched.h>
diff --git a/drivers/accel/ethosu/ethosu_drv.c b/drivers/accel/ethosu/ethosu_drv.c
index 9992193d7338..ed9c748a54ad 100644
--- a/drivers/accel/ethosu/ethosu_drv.c
+++ b/drivers/accel/ethosu/ethosu_drv.c
@@ -7,7 +7,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
diff --git a/drivers/accel/qaic/qaic_timesync.c b/drivers/accel/qaic/qaic_timesync.c
index 9faf71f47bdc..45e5f0728ebe 100644
--- a/drivers/accel/qaic/qaic_timesync.c
+++ b/drivers/accel/qaic/qaic_timesync.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/mhi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/time64.h>
 #include <linux/timer.h>
diff --git a/drivers/accel/qaic/sahara.c b/drivers/accel/qaic/sahara.c
index 9fea294e1d7b..c7c0b3eb4b65 100644
--- a/drivers/accel/qaic/sahara.c
+++ b/drivers/accel/qaic/sahara.c
@@ -7,7 +7,6 @@
 #include <linux/limits.h>
 #include <linux/mhi.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/overflow.h>
 #include <linux/types.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index c18054333f7c..4fbcaff3283c 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/device.h>
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 5d4584570ae0..4490b757abfd 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -13,7 +13,6 @@
 #include <linux/clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c
index c36ee991d5e5..b4f019f06b27 100644
--- a/drivers/ata/pata_buddha.c
+++ b/drivers/ata/pata_buddha.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/libata.h>
 #include <linux/mm.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/zorro.h>
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 1663dcd00a93..42a24dc51d26 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -44,7 +44,6 @@
 #include <linux/delay.h>
 #include <linux/dmaengine.h>
 #include <linux/ktime.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/soc/cirrus/ep93xx.h>
 
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index b37682b0578f..ad559058cfe6 100644
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
@@ -17,7 +17,6 @@
 #include <linux/clk.h>
 #include <linux/libata.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #define DRV_NAME "pata_imx"
diff --git a/drivers/auxdisplay/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c
index 30fd2341c628..70efda4f767e 100644
--- a/drivers/auxdisplay/arm-charlcd.c
+++ b/drivers/auxdisplay/arm-charlcd.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index b046513987b5..3383d2fcf063 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -9,7 +9,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/auxdisplay/lcd2s.c b/drivers/auxdisplay/lcd2s.c
index c7a962728752..7b65f4306fae 100644
--- a/drivers/auxdisplay/lcd2s.c
+++ b/drivers/auxdisplay/lcd2s.c
@@ -13,7 +13,6 @@
  */
 #include <linux/hex.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/auxdisplay/max6959.c b/drivers/auxdisplay/max6959.c
index 3bdef099a225..888788a1ff08 100644
--- a/drivers/auxdisplay/max6959.c
+++ b/drivers/auxdisplay/max6959.c
@@ -14,7 +14,6 @@
 #include <linux/device/devres.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/auxdisplay/seg-led-gpio.c b/drivers/auxdisplay/seg-led-gpio.c
index dfb62e9ce9b4..bc463118fe51 100644
--- a/drivers/auxdisplay/seg-led-gpio.c
+++ b/drivers/auxdisplay/seg-led-gpio.c
@@ -13,7 +13,6 @@
 #include <linux/errno.h>
 #include <linux/gpio/consumer.h>
 #include <linux/map_to_7segment.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index dca495be0683..4d94cc4bb21c 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -180,7 +180,7 @@ static int print_unex = 1;
 #include <linux/major.h>
 #include <linux/mc146818rtc.h>	/* CMOS defines */
 #include <linux/mm.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/pnp.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index c6d9f70ad3bb..93cdde981840 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
 #include <linux/serdev.h>
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 244447195619..b2d1ee3a3d11 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -23,7 +23,6 @@
 #include <linux/devcoredump.h>
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/acpi.h>
diff --git a/drivers/bus/mhi/ep/main.c b/drivers/bus/mhi/ep/main.c
index 0277e1ab1198..641181b1d85e 100644
--- a/drivers/bus/mhi/ep/main.c
+++ b/drivers/bus/mhi/ep/main.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/mhi_ep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include "internal.h"
 
diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c
index 0a728ca2c494..12dcb1a2753c 100644
--- a/drivers/bus/mhi/host/init.c
+++ b/drivers/bus/mhi/host/init.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/mhi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/cache/hisi_soc_hha.c b/drivers/cache/hisi_soc_hha.c
index 25ff0f5ae79b..756c43398515 100644
--- a/drivers/cache/hisi_soc_hha.c
+++ b/drivers/cache/hisi_soc_hha.c
@@ -23,7 +23,6 @@
 #include <linux/kernel.h>
 #include <linux/memregion.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/cdx/controller/cdx_controller.c b/drivers/cdx/controller/cdx_controller.c
index 280bb7490c0f..960c4f8b6b30 100644
--- a/drivers/cdx/controller/cdx_controller.c
+++ b/drivers/cdx/controller/cdx_controller.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/cdx/cdx_bus.h>
diff --git a/drivers/char/hw_random/airoha-trng.c b/drivers/char/hw_random/airoha-trng.c
index 9a648f6d9fd4..076519a2f100 100644
--- a/drivers/char/hw_random/airoha-trng.c
+++ b/drivers/char/hw_random/airoha-trng.c
@@ -3,7 +3,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/bitfield.h>
 #include <linux/delay.h>
 #include <linux/hw_random.h>
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index 6ed24be3481d..4ebbc44fecf0 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -8,7 +8,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/clk.h>
diff --git a/drivers/char/hw_random/ba431-rng.c b/drivers/char/hw_random/ba431-rng.c
index 9de7466e6896..b0a39032c610 100644
--- a/drivers/char/hw_random/ba431-rng.c
+++ b/drivers/char/hw_random/ba431-rng.c
@@ -6,7 +6,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/workqueue.h>
diff --git a/drivers/char/hw_random/bcm74110-rng.c b/drivers/char/hw_random/bcm74110-rng.c
index 5c64148e91f1..4ff9ac45202a 100644
--- a/drivers/char/hw_random/bcm74110-rng.c
+++ b/drivers/char/hw_random/bcm74110-rng.c
@@ -6,7 +6,6 @@
 #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/delay.h>
diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c
index 02e207c09e81..1fcc7eb121c2 100644
--- a/drivers/char/hw_random/exynos-trng.c
+++ b/drivers/char/hw_random/exynos-trng.c
@@ -20,7 +20,6 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/char/hw_random/histb-rng.c b/drivers/char/hw_random/histb-rng.c
index 1b91e88cc4c0..445b80beed62 100644
--- a/drivers/char/hw_random/histb-rng.c
+++ b/drivers/char/hw_random/histb-rng.c
@@ -8,7 +8,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/char/hw_random/imx-rngc.c b/drivers/char/hw_random/imx-rngc.c
index 241664a9b5d9..28c56c2d1bf6 100644
--- a/drivers/char/hw_random/imx-rngc.c
+++ b/drivers/char/hw_random/imx-rngc.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/clk.h>
diff --git a/drivers/char/hw_random/ingenic-trng.c b/drivers/char/hw_random/ingenic-trng.c
index 1672320e7d3d..0dbe116346fd 100644
--- a/drivers/char/hw_random/ingenic-trng.c
+++ b/drivers/char/hw_random/ingenic-trng.c
@@ -11,7 +11,6 @@
 #include <linux/hw_random.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c
index 440fe28bddc0..2e2aafca5cf0 100644
--- a/drivers/char/hw_random/iproc-rng200.c
+++ b/drivers/char/hw_random/iproc-rng200.c
@@ -12,7 +12,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index 6959d6edd44c..d797c6020168 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -9,7 +9,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
 #include <linux/delay.h>
diff --git a/drivers/char/hw_random/pic32-rng.c b/drivers/char/hw_random/pic32-rng.c
index 888e6f5cec1f..1c764924f2dd 100644
--- a/drivers/char/hw_random/pic32-rng.c
+++ b/drivers/char/hw_random/pic32-rng.c
@@ -12,7 +12,6 @@
 #include <linux/hw_random.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/char/hw_random/powernv-rng.c b/drivers/char/hw_random/powernv-rng.c
index 47b88de029f2..df5ba90fdb87 100644
--- a/drivers/char/hw_random/powernv-rng.c
+++ b/drivers/char/hw_random/powernv-rng.c
@@ -6,7 +6,6 @@
 #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/random.h>
diff --git a/drivers/char/hw_random/xgene-rng.c b/drivers/char/hw_random/xgene-rng.c
index 709a36507145..1f4b95341c2e 100644
--- a/drivers/char/hw_random/xgene-rng.c
+++ b/drivers/char/hw_random/xgene-rng.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/timer.h>
 
diff --git a/drivers/char/hw_random/xilinx-trng.c b/drivers/char/hw_random/xilinx-trng.c
index f615d5adddde..0fbc22c38fbc 100644
--- a/drivers/char/hw_random/xilinx-trng.c
+++ b/drivers/char/hw_random/xilinx-trng.c
@@ -14,7 +14,6 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 /* TRNG Registers Offsets */
diff --git a/drivers/char/hw_random/xiphera-trng.c b/drivers/char/hw_random/xiphera-trng.c
index 4af64f76c8d6..ab5d852ff69f 100644
--- a/drivers/char/hw_random/xiphera-trng.c
+++ b/drivers/char/hw_random/xiphera-trng.c
@@ -3,7 +3,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/hw_random.h>
diff --git a/drivers/clk/aspeed/clk-ast2600.c b/drivers/clk/aspeed/clk-ast2600.c
index 873879e5ad9b..70061c961b69 100644
--- a/drivers/clk/aspeed/clk-ast2600.c
+++ b/drivers/clk/aspeed/clk-ast2600.c
@@ -5,7 +5,6 @@
 #define pr_fmt(fmt) "clk-ast2600: " fmt
 
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/aspeed/clk-ast2700.c b/drivers/clk/aspeed/clk-ast2700.c
index 8b7b382f6f3e..aa4dd7f24608 100644
--- a/drivers/clk/aspeed/clk-ast2700.c
+++ b/drivers/clk/aspeed/clk-ast2700.c
@@ -7,7 +7,6 @@
 #include <linux/bitfield.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/units.h>
diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c
index fa5ccef73e60..1568d214fa39 100644
--- a/drivers/clk/clk-axi-clkgen.c
+++ b/drivers/clk/clk-axi-clkgen.c
@@ -13,7 +13,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/clk/clk-bm1880.c b/drivers/clk/clk-bm1880.c
index 46251008c83f..122e57176c1c 100644
--- a/drivers/clk/clk-bm1880.c
+++ b/drivers/clk/clk-bm1880.c
@@ -9,7 +9,6 @@
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/clk/clk-cdce706.c b/drivers/clk/clk-cdce706.c
index a495d313b02f..b7063cf5c5c1 100644
--- a/drivers/clk/clk-cdce706.c
+++ b/drivers/clk/clk-cdce706.c
@@ -12,7 +12,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/rational.h>
diff --git a/drivers/clk/clk-eyeq.c b/drivers/clk/clk-eyeq.c
index d9303c2c7aa5..9743de55bdf8 100644
--- a/drivers/clk/clk-eyeq.c
+++ b/drivers/clk/clk-eyeq.c
@@ -33,7 +33,6 @@
 #include <linux/init.h>
 #include <linux/io-64-nonatomic-hi-lo.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
diff --git a/drivers/clk/clk-renesas-pcie.c b/drivers/clk/clk-renesas-pcie.c
index aa108df12e44..2f6d80ee77cc 100644
--- a/drivers/clk/clk-renesas-pcie.c
+++ b/drivers/clk/clk-renesas-pcie.c
@@ -14,7 +14,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/clk-si521xx.c b/drivers/clk/clk-si521xx.c
index 4ed4e1a5f4f2..ceadc07bcb6d 100644
--- a/drivers/clk/clk-si521xx.c
+++ b/drivers/clk/clk-si521xx.c
@@ -16,7 +16,6 @@
 #include <linux/bitrev.h>
 #include <linux/clk-provider.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/clk-versaclock5.c b/drivers/clk/clk-versaclock5.c
index 57228e88e81d..913fcc5675f1 100644
--- a/drivers/clk/clk-versaclock5.c
+++ b/drivers/clk/clk-versaclock5.c
@@ -16,7 +16,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/property.h>
diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c
index 131702f2c9ec..2225796a9c08 100644
--- a/drivers/clk/imx/clk-imx8mp-audiomix.c
+++ b/drivers/clk/imx/clk-imx8mp-audiomix.c
@@ -9,7 +9,6 @@
 #include <linux/clk-provider.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/clk/mediatek/clk-mt2701-g3d.c b/drivers/clk/mediatek/clk-mt2701-g3d.c
index b3e18b6db75d..a47d6649e4af 100644
--- a/drivers/clk/mediatek/clk-mt2701-g3d.c
+++ b/drivers/clk/mediatek/clk-mt2701-g3d.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
index d9f40fda73d1..710c4f2f9f30 100644
--- a/drivers/clk/mediatek/clk-mt2701.c
+++ b/drivers/clk/mediatek/clk-mt2701.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-cpumux.h"
diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c
index 964c92130e3c..6109b55913b3 100644
--- a/drivers/clk/mediatek/clk-mt2712.c
+++ b/drivers/clk/mediatek/clk-mt2712.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/clk/mediatek/clk-mt6765.c b/drivers/clk/mediatek/clk-mt6765.c
index 60f6f9fa7dcf..71956a528fa4 100644
--- a/drivers/clk/mediatek/clk-mt6765.c
+++ b/drivers/clk/mediatek/clk-mt6765.c
@@ -9,7 +9,6 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt6779-aud.c b/drivers/clk/mediatek/clk-mt6779-aud.c
index 8ed318bd7765..30c290fd6b84 100644
--- a/drivers/clk/mediatek/clk-mt6779-aud.c
+++ b/drivers/clk/mediatek/clk-mt6779-aud.c
@@ -6,7 +6,6 @@
 
 #include <linux/module.h>
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt7622-eth.c b/drivers/clk/mediatek/clk-mt7622-eth.c
index 1c1033a92c46..c412b04e5ad5 100644
--- a/drivers/clk/mediatek/clk-mt7622-eth.c
+++ b/drivers/clk/mediatek/clk-mt7622-eth.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt7622-hif.c b/drivers/clk/mediatek/clk-mt7622-hif.c
index 5bcfe12c4fd0..22cf98360d2f 100644
--- a/drivers/clk/mediatek/clk-mt7622-hif.c
+++ b/drivers/clk/mediatek/clk-mt7622-hif.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index f62b03abab4f..a8b3079776bd 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-cpumux.h"
diff --git a/drivers/clk/mediatek/clk-mt7629-hif.c b/drivers/clk/mediatek/clk-mt7629-hif.c
index 3fdc2d7d4274..1dd069fe675c 100644
--- a/drivers/clk/mediatek/clk-mt7629-hif.c
+++ b/drivers/clk/mediatek/clk-mt7629-hif.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt7981-apmixed.c b/drivers/clk/mediatek/clk-mt7981-apmixed.c
index 6606b54fb376..851d0bc7840a 100644
--- a/drivers/clk/mediatek/clk-mt7981-apmixed.c
+++ b/drivers/clk/mediatek/clk-mt7981-apmixed.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt7981-eth.c b/drivers/clk/mediatek/clk-mt7981-eth.c
index 0655ebb6c561..d28c1c95c2a3 100644
--- a/drivers/clk/mediatek/clk-mt7981-eth.c
+++ b/drivers/clk/mediatek/clk-mt7981-eth.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt7981-infracfg.c b/drivers/clk/mediatek/clk-mt7981-infracfg.c
index 0487b6bb80ae..68a102d21380 100644
--- a/drivers/clk/mediatek/clk-mt7981-infracfg.c
+++ b/drivers/clk/mediatek/clk-mt7981-infracfg.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "clk-mtk.h"
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt7981-topckgen.c b/drivers/clk/mediatek/clk-mt7981-topckgen.c
index 1943f11e47c1..e71ae8fadd5d 100644
--- a/drivers/clk/mediatek/clk-mt7981-topckgen.c
+++ b/drivers/clk/mediatek/clk-mt7981-topckgen.c
@@ -8,7 +8,6 @@
 
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "clk-mtk.h"
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt7986-apmixed.c b/drivers/clk/mediatek/clk-mt7986-apmixed.c
index 1c79418d08a7..af3e002bbfb7 100644
--- a/drivers/clk/mediatek/clk-mt7986-apmixed.c
+++ b/drivers/clk/mediatek/clk-mt7986-apmixed.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt7986-eth.c b/drivers/clk/mediatek/clk-mt7986-eth.c
index 4514d42c0829..03f14fd85610 100644
--- a/drivers/clk/mediatek/clk-mt7986-eth.c
+++ b/drivers/clk/mediatek/clk-mt7986-eth.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt7986-infracfg.c b/drivers/clk/mediatek/clk-mt7986-infracfg.c
index 732c65e616de..8e479ca6be7e 100644
--- a/drivers/clk/mediatek/clk-mt7986-infracfg.c
+++ b/drivers/clk/mediatek/clk-mt7986-infracfg.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "clk-mtk.h"
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt7986-topckgen.c b/drivers/clk/mediatek/clk-mt7986-topckgen.c
index 2dd30da306d9..1489fc58bfdf 100644
--- a/drivers/clk/mediatek/clk-mt7986-topckgen.c
+++ b/drivers/clk/mediatek/clk-mt7986-topckgen.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "clk-mtk.h"
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt8167-aud.c b/drivers/clk/mediatek/clk-mt8167-aud.c
index d6cff4bdf4cb..6d1057bc6098 100644
--- a/drivers/clk/mediatek/clk-mt8167-aud.c
+++ b/drivers/clk/mediatek/clk-mt8167-aud.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8167-img.c b/drivers/clk/mediatek/clk-mt8167-img.c
index 42d38ae94b69..0ad163e65e37 100644
--- a/drivers/clk/mediatek/clk-mt8167-img.c
+++ b/drivers/clk/mediatek/clk-mt8167-img.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8167-mfgcfg.c b/drivers/clk/mediatek/clk-mt8167-mfgcfg.c
index 1ef37a3e6851..2904aea984aa 100644
--- a/drivers/clk/mediatek/clk-mt8167-mfgcfg.c
+++ b/drivers/clk/mediatek/clk-mt8167-mfgcfg.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8167-mm.c b/drivers/clk/mediatek/clk-mt8167-mm.c
index cef66ee836f3..f9fc003e5c68 100644
--- a/drivers/clk/mediatek/clk-mt8167-mm.c
+++ b/drivers/clk/mediatek/clk-mt8167-mm.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8167-vdec.c b/drivers/clk/mediatek/clk-mt8167-vdec.c
index e3769bc556a9..f6b681cc1d03 100644
--- a/drivers/clk/mediatek/clk-mt8167-vdec.c
+++ b/drivers/clk/mediatek/clk-mt8167-vdec.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8173-mm.c b/drivers/clk/mediatek/clk-mt8173-mm.c
index 26d27250b914..9c022378c268 100644
--- a/drivers/clk/mediatek/clk-mt8173-mm.c
+++ b/drivers/clk/mediatek/clk-mt8173-mm.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt8183.c b/drivers/clk/mediatek/clk-mt8183.c
index aa7cc7709b2d..140fcf524ce6 100644
--- a/drivers/clk/mediatek/clk-mt8183.c
+++ b/drivers/clk/mediatek/clk-mt8183.c
@@ -5,7 +5,6 @@
 
 #include <linux/delay.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c b/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c
index dcde2187d24a..36f27401cc87 100644
--- a/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c
+++ b/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
diff --git a/drivers/clk/mediatek/clk-mt8188-apmixedsys.c b/drivers/clk/mediatek/clk-mt8188-apmixedsys.c
index a1de596bff99..48a2f61d4b77 100644
--- a/drivers/clk/mediatek/clk-mt8188-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8188-apmixedsys.c
@@ -5,7 +5,6 @@
  */
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c b/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c
index 14a4b575b583..efbd9168edcc 100644
--- a/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c
+++ b/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
diff --git a/drivers/clk/mediatek/clk-mt8188-topckgen.c b/drivers/clk/mediatek/clk-mt8188-topckgen.c
index 6b07abe9a8f5..694d894aaa33 100644
--- a/drivers/clk/mediatek/clk-mt8188-topckgen.c
+++ b/drivers/clk/mediatek/clk-mt8188-topckgen.c
@@ -5,7 +5,6 @@
  */
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-gate.h"
diff --git a/drivers/clk/mediatek/clk-mt8188-vdo0.c b/drivers/clk/mediatek/clk-mt8188-vdo0.c
index 017d6662589b..d7b7d48b6d08 100644
--- a/drivers/clk/mediatek/clk-mt8188-vdo0.c
+++ b/drivers/clk/mediatek/clk-mt8188-vdo0.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
diff --git a/drivers/clk/mediatek/clk-mt8188-vdo1.c b/drivers/clk/mediatek/clk-mt8188-vdo1.c
index f715d45e545e..c44aa089f83f 100644
--- a/drivers/clk/mediatek/clk-mt8188-vdo1.c
+++ b/drivers/clk/mediatek/clk-mt8188-vdo1.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
diff --git a/drivers/clk/mediatek/clk-mt8188-venc.c b/drivers/clk/mediatek/clk-mt8188-venc.c
index 01e971545506..250cdadbb28b 100644
--- a/drivers/clk/mediatek/clk-mt8188-venc.c
+++ b/drivers/clk/mediatek/clk-mt8188-venc.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
diff --git a/drivers/clk/mediatek/clk-mt8188-wpe.c b/drivers/clk/mediatek/clk-mt8188-wpe.c
index d709bb1ee1d6..ab77b250e6db 100644
--- a/drivers/clk/mediatek/clk-mt8188-wpe.c
+++ b/drivers/clk/mediatek/clk-mt8188-wpe.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/mediatek,mt8188-clk.h>
diff --git a/drivers/clk/mediatek/clk-mt8192-cam.c b/drivers/clk/mediatek/clk-mt8192-cam.c
index 891d2f88d9cf..dbae1aca56a9 100644
--- a/drivers/clk/mediatek/clk-mt8192-cam.c
+++ b/drivers/clk/mediatek/clk-mt8192-cam.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-img.c b/drivers/clk/mediatek/clk-mt8192-img.c
index c08e831125a5..aa38ee8d053d 100644
--- a/drivers/clk/mediatek/clk-mt8192-img.c
+++ b/drivers/clk/mediatek/clk-mt8192-img.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c b/drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c
index 0f9530d9263c..f280f002b8db 100644
--- a/drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c
+++ b/drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-ipe.c b/drivers/clk/mediatek/clk-mt8192-ipe.c
index c932b8b20edc..a1f073bf53de 100644
--- a/drivers/clk/mediatek/clk-mt8192-ipe.c
+++ b/drivers/clk/mediatek/clk-mt8192-ipe.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-mdp.c b/drivers/clk/mediatek/clk-mt8192-mdp.c
index 30334ebca864..fb05866d394f 100644
--- a/drivers/clk/mediatek/clk-mt8192-mdp.c
+++ b/drivers/clk/mediatek/clk-mt8192-mdp.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-mfg.c b/drivers/clk/mediatek/clk-mt8192-mfg.c
index 9d176659e8a2..0d84ff233215 100644
--- a/drivers/clk/mediatek/clk-mt8192-mfg.c
+++ b/drivers/clk/mediatek/clk-mt8192-mfg.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-msdc.c b/drivers/clk/mediatek/clk-mt8192-msdc.c
index 04a66220f269..fd7eecfe3077 100644
--- a/drivers/clk/mediatek/clk-mt8192-msdc.c
+++ b/drivers/clk/mediatek/clk-mt8192-msdc.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-scp_adsp.c b/drivers/clk/mediatek/clk-mt8192-scp_adsp.c
index f9e4c16573e2..256a410ad433 100644
--- a/drivers/clk/mediatek/clk-mt8192-scp_adsp.c
+++ b/drivers/clk/mediatek/clk-mt8192-scp_adsp.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-vdec.c b/drivers/clk/mediatek/clk-mt8192-vdec.c
index 9c10161807b2..4ce0cfa375a0 100644
--- a/drivers/clk/mediatek/clk-mt8192-vdec.c
+++ b/drivers/clk/mediatek/clk-mt8192-vdec.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192-venc.c b/drivers/clk/mediatek/clk-mt8192-venc.c
index 0b01e2b7f036..dd87fdea7ae2 100644
--- a/drivers/clk/mediatek/clk-mt8192-venc.c
+++ b/drivers/clk/mediatek/clk-mt8192-venc.c
@@ -4,7 +4,6 @@
 // Author: Chun-Jie Chen <chun-jie.chen@mediatek.com>
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/mediatek/clk-mt8192.c b/drivers/clk/mediatek/clk-mt8192.c
index 50b43807c60c..5f7b6b9a4546 100644
--- a/drivers/clk/mediatek/clk-mt8192.c
+++ b/drivers/clk/mediatek/clk-mt8192.c
@@ -6,7 +6,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
index 44917ab034c5..a120c3305547 100644
--- a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
@@ -10,7 +10,6 @@
 #include "clk-pllfh.h"
 
 #include <dt-bindings/clock/mt8195-clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 static const struct mtk_gate_regs apmixed_cg_regs = {
diff --git a/drivers/clk/mediatek/clk-mt8195-topckgen.c b/drivers/clk/mediatek/clk-mt8195-topckgen.c
index b1f44b873354..b2fecd37cfd4 100644
--- a/drivers/clk/mediatek/clk-mt8195-topckgen.c
+++ b/drivers/clk/mediatek/clk-mt8195-topckgen.c
@@ -8,7 +8,6 @@
 #include "clk-mux.h"
 
 #include <dt-bindings/clock/mt8195-clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 static DEFINE_SPINLOCK(mt8195_clk_lock);
diff --git a/drivers/clk/mediatek/clk-mt8365.c b/drivers/clk/mediatek/clk-mt8365.c
index e7952121112e..614848c75e3b 100644
--- a/drivers/clk/mediatek/clk-mt8365.c
+++ b/drivers/clk/mediatek/clk-mt8365.c
@@ -10,7 +10,6 @@
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/clk/mediatek/clk-mt8516-aud.c b/drivers/clk/mediatek/clk-mt8516-aud.c
index 6227635fd5a1..6104ccc34e8d 100644
--- a/drivers/clk/mediatek/clk-mt8516-aud.c
+++ b/drivers/clk/mediatek/clk-mt8516-aud.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "clk-mtk.h"
diff --git a/drivers/clk/meson/a1-peripherals.c b/drivers/clk/meson/a1-peripherals.c
index 5e0d58c01405..43cd6281b719 100644
--- a/drivers/clk/meson/a1-peripherals.c
+++ b/drivers/clk/meson/a1-peripherals.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "clk-dualdiv.h"
 #include "clk-regmap.h"
diff --git a/drivers/clk/meson/a1-pll.c b/drivers/clk/meson/a1-pll.c
index 1f82e9c7c14e..100c4221256e 100644
--- a/drivers/clk/meson/a1-pll.c
+++ b/drivers/clk/meson/a1-pll.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "clk-pll.h"
 #include "clk-regmap.h"
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 0a25c649ef1d..280842e9cb37 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -11,7 +11,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index f9131d014ef4..39af7b1868e3 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 
diff --git a/drivers/clk/qcom/cambistmclkcc-kaanapali.c b/drivers/clk/qcom/cambistmclkcc-kaanapali.c
index 6028d8f6959c..c96e9196d908 100644
--- a/drivers/clk/qcom/cambistmclkcc-kaanapali.c
+++ b/drivers/clk/qcom/cambistmclkcc-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/cambistmclkcc-sm8750.c b/drivers/clk/qcom/cambistmclkcc-sm8750.c
index 5df12aced4a5..69abb756c04f 100644
--- a/drivers/clk/qcom/cambistmclkcc-sm8750.c
+++ b/drivers/clk/qcom/cambistmclkcc-sm8750.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-kaanapali.c b/drivers/clk/qcom/camcc-kaanapali.c
index af5486418492..50bd19fdaba0 100644
--- a/drivers/clk/qcom/camcc-kaanapali.c
+++ b/drivers/clk/qcom/camcc-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-milos.c b/drivers/clk/qcom/camcc-milos.c
index 409d47098c10..523ee2d96201 100644
--- a/drivers/clk/qcom/camcc-milos.c
+++ b/drivers/clk/qcom/camcc-milos.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-qcs615.c b/drivers/clk/qcom/camcc-qcs615.c
index 8377126c2cfe..db50c0751472 100644
--- a/drivers/clk/qcom/camcc-qcs615.c
+++ b/drivers/clk/qcom/camcc-qcs615.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sa8775p.c b/drivers/clk/qcom/camcc-sa8775p.c
index 50e5a131261b..914478139e97 100644
--- a/drivers/clk/qcom/camcc-sa8775p.c
+++ b/drivers/clk/qcom/camcc-sa8775p.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c
index 5031df813b4a..a69b70ab1a70 100644
--- a/drivers/clk/qcom/camcc-sc7180.c
+++ b/drivers/clk/qcom/camcc-sc7180.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_clock.h>
diff --git a/drivers/clk/qcom/camcc-sc7280.c b/drivers/clk/qcom/camcc-sc7280.c
index 55545f5fdb98..5a9992a5b5ba 100644
--- a/drivers/clk/qcom/camcc-sc7280.c
+++ b/drivers/clk/qcom/camcc-sc7280.c
@@ -7,7 +7,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sc8180x.c b/drivers/clk/qcom/camcc-sc8180x.c
index 016f37d08468..c8b98f81ddef 100644
--- a/drivers/clk/qcom/camcc-sc8180x.c
+++ b/drivers/clk/qcom/camcc-sc8180x.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sc8280xp.c b/drivers/clk/qcom/camcc-sc8280xp.c
index 18f5a3eb313e..e97b8d4f3c84 100644
--- a/drivers/clk/qcom/camcc-sc8280xp.c
+++ b/drivers/clk/qcom/camcc-sc8280xp.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/camcc-sdm845.c b/drivers/clk/qcom/camcc-sdm845.c
index fb313da7165b..534dc56fc13c 100644
--- a/drivers/clk/qcom/camcc-sdm845.c
+++ b/drivers/clk/qcom/camcc-sdm845.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm4450.c b/drivers/clk/qcom/camcc-sm4450.c
index 6170d5ad9cbf..586c1d103132 100644
--- a/drivers/clk/qcom/camcc-sm4450.c
+++ b/drivers/clk/qcom/camcc-sm4450.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/clk/qcom/camcc-sm6350.c b/drivers/clk/qcom/camcc-sm6350.c
index 7df12c1311c6..9a62228c314c 100644
--- a/drivers/clk/qcom/camcc-sm6350.c
+++ b/drivers/clk/qcom/camcc-sm6350.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm7150.c b/drivers/clk/qcom/camcc-sm7150.c
index ee963ed341c3..6f75689e9847 100644
--- a/drivers/clk/qcom/camcc-sm7150.c
+++ b/drivers/clk/qcom/camcc-sm7150.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm8150.c b/drivers/clk/qcom/camcc-sm8150.c
index 62aadb27c50e..fcbaff55fc27 100644
--- a/drivers/clk/qcom/camcc-sm8150.c
+++ b/drivers/clk/qcom/camcc-sm8150.c
@@ -6,7 +6,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm8250.c b/drivers/clk/qcom/camcc-sm8250.c
index c95a00628630..21e942367621 100644
--- a/drivers/clk/qcom/camcc-sm8250.c
+++ b/drivers/clk/qcom/camcc-sm8250.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm8450.c b/drivers/clk/qcom/camcc-sm8450.c
index 1891262a559b..4025db23d1a9 100644
--- a/drivers/clk/qcom/camcc-sm8450.c
+++ b/drivers/clk/qcom/camcc-sm8450.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm8550.c b/drivers/clk/qcom/camcc-sm8550.c
index 34d53e2ffad7..aaae5e671905 100644
--- a/drivers/clk/qcom/camcc-sm8550.c
+++ b/drivers/clk/qcom/camcc-sm8550.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm8650.c b/drivers/clk/qcom/camcc-sm8650.c
index 9dea43e74cb6..3aad816ed233 100644
--- a/drivers/clk/qcom/camcc-sm8650.c
+++ b/drivers/clk/qcom/camcc-sm8650.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-sm8750.c b/drivers/clk/qcom/camcc-sm8750.c
index 6618b074c90e..4dac298f06b1 100644
--- a/drivers/clk/qcom/camcc-sm8750.c
+++ b/drivers/clk/qcom/camcc-sm8750.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/camcc-x1e80100.c b/drivers/clk/qcom/camcc-x1e80100.c
index 81f579ff6993..d02b0f0effce 100644
--- a/drivers/clk/qcom/camcc-x1e80100.c
+++ b/drivers/clk/qcom/camcc-x1e80100.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-eliza.c b/drivers/clk/qcom/dispcc-eliza.c
index 479f26e0dde2..760881cb1077 100644
--- a/drivers/clk/qcom/dispcc-eliza.c
+++ b/drivers/clk/qcom/dispcc-eliza.c
@@ -7,7 +7,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-glymur.c b/drivers/clk/qcom/dispcc-glymur.c
index c4bb328d432f..32cc5226b4de 100644
--- a/drivers/clk/qcom/dispcc-glymur.c
+++ b/drivers/clk/qcom/dispcc-glymur.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-kaanapali.c b/drivers/clk/qcom/dispcc-kaanapali.c
index 42912c617c31..f8832482bd7a 100644
--- a/drivers/clk/qcom/dispcc-kaanapali.c
+++ b/drivers/clk/qcom/dispcc-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-milos.c b/drivers/clk/qcom/dispcc-milos.c
index dfffb6d14b0e..c2f37d3458a0 100644
--- a/drivers/clk/qcom/dispcc-milos.c
+++ b/drivers/clk/qcom/dispcc-milos.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-qcm2290.c b/drivers/clk/qcom/dispcc-qcm2290.c
index 6d88d067337f..4d6aad280ae1 100644
--- a/drivers/clk/qcom/dispcc-qcm2290.c
+++ b/drivers/clk/qcom/dispcc-qcm2290.c
@@ -7,7 +7,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-qcs615.c b/drivers/clk/qcom/dispcc-qcs615.c
index 637698e6dc2b..6a19f00f6bfa 100644
--- a/drivers/clk/qcom/dispcc-qcs615.c
+++ b/drivers/clk/qcom/dispcc-qcs615.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sc7180.c b/drivers/clk/qcom/dispcc-sc7180.c
index d7e37fbbe87e..ae98fe4dcfb2 100644
--- a/drivers/clk/qcom/dispcc-sc7180.c
+++ b/drivers/clk/qcom/dispcc-sc7180.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sc7280.c b/drivers/clk/qcom/dispcc-sc7280.c
index 465dc06c8712..d11265debaf9 100644
--- a/drivers/clk/qcom/dispcc-sc7280.c
+++ b/drivers/clk/qcom/dispcc-sc7280.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sc8280xp.c b/drivers/clk/qcom/dispcc-sc8280xp.c
index acc927c2142a..96609bd5233f 100644
--- a/drivers/clk/qcom/dispcc-sc8280xp.c
+++ b/drivers/clk/qcom/dispcc-sc8280xp.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_clock.h>
diff --git a/drivers/clk/qcom/dispcc-sdm845.c b/drivers/clk/qcom/dispcc-sdm845.c
index 78e43f6d7502..6ad6c4f5d337 100644
--- a/drivers/clk/qcom/dispcc-sdm845.c
+++ b/drivers/clk/qcom/dispcc-sdm845.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm4450.c b/drivers/clk/qcom/dispcc-sm4450.c
index 2fdacc26df69..4a4811db55dd 100644
--- a/drivers/clk/qcom/dispcc-sm4450.c
+++ b/drivers/clk/qcom/dispcc-sm4450.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/clk/qcom/dispcc-sm6115.c b/drivers/clk/qcom/dispcc-sm6115.c
index 75bd57213079..9a7b8ad646ed 100644
--- a/drivers/clk/qcom/dispcc-sm6115.c
+++ b/drivers/clk/qcom/dispcc-sm6115.c
@@ -8,7 +8,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm6125.c b/drivers/clk/qcom/dispcc-sm6125.c
index 2c67abcfef12..27a73665769c 100644
--- a/drivers/clk/qcom/dispcc-sm6125.c
+++ b/drivers/clk/qcom/dispcc-sm6125.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm6350.c b/drivers/clk/qcom/dispcc-sm6350.c
index 5b1d8f86515f..16948f435340 100644
--- a/drivers/clk/qcom/dispcc-sm6350.c
+++ b/drivers/clk/qcom/dispcc-sm6350.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm6375.c b/drivers/clk/qcom/dispcc-sm6375.c
index ec9dbb1f4a7c..167dd369a794 100644
--- a/drivers/clk/qcom/dispcc-sm6375.c
+++ b/drivers/clk/qcom/dispcc-sm6375.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm7150.c b/drivers/clk/qcom/dispcc-sm7150.c
index ed8e34ffd69b..b9df6153e50f 100644
--- a/drivers/clk/qcom/dispcc-sm7150.c
+++ b/drivers/clk/qcom/dispcc-sm7150.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c
index e59cdadd5647..fdc07323f298 100644
--- a/drivers/clk/qcom/dispcc-sm8250.c
+++ b/drivers/clk/qcom/dispcc-sm8250.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/dispcc-sm8450.c b/drivers/clk/qcom/dispcc-sm8450.c
index 2e91332dd92a..3af120e54cdd 100644
--- a/drivers/clk/qcom/dispcc-sm8450.c
+++ b/drivers/clk/qcom/dispcc-sm8450.c
@@ -7,7 +7,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm8550.c b/drivers/clk/qcom/dispcc-sm8550.c
index f27140c649f5..418dcea20f00 100644
--- a/drivers/clk/qcom/dispcc-sm8550.c
+++ b/drivers/clk/qcom/dispcc-sm8550.c
@@ -7,7 +7,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-sm8750.c b/drivers/clk/qcom/dispcc-sm8750.c
index ca09da111a50..18e86b80e581 100644
--- a/drivers/clk/qcom/dispcc-sm8750.c
+++ b/drivers/clk/qcom/dispcc-sm8750.c
@@ -7,7 +7,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc-x1e80100.c b/drivers/clk/qcom/dispcc-x1e80100.c
index cd45bedf2649..8d481d992e81 100644
--- a/drivers/clk/qcom/dispcc-x1e80100.c
+++ b/drivers/clk/qcom/dispcc-x1e80100.c
@@ -6,7 +6,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/dispcc0-sa8775p.c b/drivers/clk/qcom/dispcc0-sa8775p.c
index b248fa970587..0e976442834a 100644
--- a/drivers/clk/qcom/dispcc0-sa8775p.c
+++ b/drivers/clk/qcom/dispcc0-sa8775p.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/dispcc1-sa8775p.c b/drivers/clk/qcom/dispcc1-sa8775p.c
index 9882edbb79f9..58008c1afc76 100644
--- a/drivers/clk/qcom/dispcc1-sa8775p.c
+++ b/drivers/clk/qcom/dispcc1-sa8775p.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/ecpricc-qdu1000.c b/drivers/clk/qcom/ecpricc-qdu1000.c
index c2a16616ed64..5a33aa1615b8 100644
--- a/drivers/clk/qcom/ecpricc-qdu1000.c
+++ b/drivers/clk/qcom/ecpricc-qdu1000.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-eliza.c b/drivers/clk/qcom/gcc-eliza.c
index 24c3aae0810f..3e26c7a1e5b5 100644
--- a/drivers/clk/qcom/gcc-eliza.c
+++ b/drivers/clk/qcom/gcc-eliza.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-glymur.c b/drivers/clk/qcom/gcc-glymur.c
index 2736465efdea..f4ede4a3a1c0 100644
--- a/drivers/clk/qcom/gcc-glymur.c
+++ b/drivers/clk/qcom/gcc-glymur.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-ipq5018.c b/drivers/clk/qcom/gcc-ipq5018.c
index 64792cda0620..594dae3bac4c 100644
--- a/drivers/clk/qcom/gcc-ipq5018.c
+++ b/drivers/clk/qcom/gcc-ipq5018.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2023, The Linux Foundation. All rights reserved.
  */
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-ipq5332.c b/drivers/clk/qcom/gcc-ipq5332.c
index 9246e97d785a..ecd9ebeed754 100644
--- a/drivers/clk/qcom/gcc-ipq5332.c
+++ b/drivers/clk/qcom/gcc-ipq5332.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-kaanapali.c b/drivers/clk/qcom/gcc-kaanapali.c
index 6e628b51f38c..842c1a70c691 100644
--- a/drivers/clk/qcom/gcc-kaanapali.c
+++ b/drivers/clk/qcom/gcc-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-milos.c b/drivers/clk/qcom/gcc-milos.c
index 67d0eee8ef35..4219af2879d9 100644
--- a/drivers/clk/qcom/gcc-milos.c
+++ b/drivers/clk/qcom/gcc-milos.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-nord.c b/drivers/clk/qcom/gcc-nord.c
index 3098d8fac0fb..9ef8b0e3bb68 100644
--- a/drivers/clk/qcom/gcc-nord.c
+++ b/drivers/clk/qcom/gcc-nord.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-qcs615.c b/drivers/clk/qcom/gcc-qcs615.c
index 5b3b8dd4f114..57f8c80c6f32 100644
--- a/drivers/clk/qcom/gcc-qcs615.c
+++ b/drivers/clk/qcom/gcc-qcs615.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-qcs8300.c b/drivers/clk/qcom/gcc-qcs8300.c
index 80831c7dea3b..07218d9c96a7 100644
--- a/drivers/clk/qcom/gcc-qcs8300.c
+++ b/drivers/clk/qcom/gcc-qcs8300.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-sa8775p.c b/drivers/clk/qcom/gcc-sa8775p.c
index e7425e82c54f..dca316decd0e 100644
--- a/drivers/clk/qcom/gcc-sa8775p.c
+++ b/drivers/clk/qcom/gcc-sa8775p.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-sdx75.c b/drivers/clk/qcom/gcc-sdx75.c
index 1f3cd58483a2..6712e76f875c 100644
--- a/drivers/clk/qcom/gcc-sdx75.c
+++ b/drivers/clk/qcom/gcc-sdx75.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-sm4450.c b/drivers/clk/qcom/gcc-sm4450.c
index 023d840e9f4e..30fc7af09930 100644
--- a/drivers/clk/qcom/gcc-sm4450.c
+++ b/drivers/clk/qcom/gcc-sm4450.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-sm7150.c b/drivers/clk/qcom/gcc-sm7150.c
index 7eabaf0e1b57..dcb5d82a1a31 100644
--- a/drivers/clk/qcom/gcc-sm7150.c
+++ b/drivers/clk/qcom/gcc-sm7150.c
@@ -8,7 +8,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-sm8650.c b/drivers/clk/qcom/gcc-sm8650.c
index 2dd6444ce036..f7e2d7ec60c9 100644
--- a/drivers/clk/qcom/gcc-sm8650.c
+++ b/drivers/clk/qcom/gcc-sm8650.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-sm8750.c b/drivers/clk/qcom/gcc-sm8750.c
index db81569dd4b1..6cfe90122268 100644
--- a/drivers/clk/qcom/gcc-sm8750.c
+++ b/drivers/clk/qcom/gcc-sm8750.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gcc-x1e80100.c b/drivers/clk/qcom/gcc-x1e80100.c
index 73a2a5112623..8c146d62c077 100644
--- a/drivers/clk/qcom/gcc-x1e80100.c
+++ b/drivers/clk/qcom/gcc-x1e80100.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-glymur.c b/drivers/clk/qcom/gpucc-glymur.c
index 54cc3127718a..001b2454786a 100644
--- a/drivers/clk/qcom/gpucc-glymur.c
+++ b/drivers/clk/qcom/gpucc-glymur.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-kaanapali.c b/drivers/clk/qcom/gpucc-kaanapali.c
index 7f6013b348ad..ae5563e516f6 100644
--- a/drivers/clk/qcom/gpucc-kaanapali.c
+++ b/drivers/clk/qcom/gpucc-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-milos.c b/drivers/clk/qcom/gpucc-milos.c
index 1448d95cb1dc..6129f9aa5802 100644
--- a/drivers/clk/qcom/gpucc-milos.c
+++ b/drivers/clk/qcom/gpucc-milos.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-msm8998.c b/drivers/clk/qcom/gpucc-msm8998.c
index 7fce70503141..066793e47f79 100644
--- a/drivers/clk/qcom/gpucc-msm8998.c
+++ b/drivers/clk/qcom/gpucc-msm8998.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/clk-provider.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-qcm2290.c b/drivers/clk/qcom/gpucc-qcm2290.c
index dc369dff882e..66dea9d2a0e5 100644
--- a/drivers/clk/qcom/gpucc-qcm2290.c
+++ b/drivers/clk/qcom/gpucc-qcm2290.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_clock.h>
diff --git a/drivers/clk/qcom/gpucc-qcs615.c b/drivers/clk/qcom/gpucc-qcs615.c
index 91919cdb75ae..5032d0900c69 100644
--- a/drivers/clk/qcom/gpucc-qcs615.c
+++ b/drivers/clk/qcom/gpucc-qcs615.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sa8775p.c b/drivers/clk/qcom/gpucc-sa8775p.c
index 25dcc5912f99..759827e84c56 100644
--- a/drivers/clk/qcom/gpucc-sa8775p.c
+++ b/drivers/clk/qcom/gpucc-sa8775p.c
@@ -7,7 +7,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sar2130p.c b/drivers/clk/qcom/gpucc-sar2130p.c
index c2903179ac85..dd72b2a48c42 100644
--- a/drivers/clk/qcom/gpucc-sar2130p.c
+++ b/drivers/clk/qcom/gpucc-sar2130p.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sc7180.c b/drivers/clk/qcom/gpucc-sc7180.c
index 97287488e05a..b14a53db55fd 100644
--- a/drivers/clk/qcom/gpucc-sc7180.c
+++ b/drivers/clk/qcom/gpucc-sc7180.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sc7280.c b/drivers/clk/qcom/gpucc-sc7280.c
index f81289fa719d..bd699a624517 100644
--- a/drivers/clk/qcom/gpucc-sc7280.c
+++ b/drivers/clk/qcom/gpucc-sc7280.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sc8280xp.c b/drivers/clk/qcom/gpucc-sc8280xp.c
index 2645612f1cac..5dd90b854afb 100644
--- a/drivers/clk/qcom/gpucc-sc8280xp.c
+++ b/drivers/clk/qcom/gpucc-sc8280xp.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/gpucc-sdm660.c b/drivers/clk/qcom/gpucc-sdm660.c
index 28db307b6717..6d37b3d8d1a4 100644
--- a/drivers/clk/qcom/gpucc-sdm660.c
+++ b/drivers/clk/qcom/gpucc-sdm660.c
@@ -9,7 +9,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sdm845.c b/drivers/clk/qcom/gpucc-sdm845.c
index 0d63b110a1fb..ef26690cf504 100644
--- a/drivers/clk/qcom/gpucc-sdm845.c
+++ b/drivers/clk/qcom/gpucc-sdm845.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm4450.c b/drivers/clk/qcom/gpucc-sm4450.c
index 34c7ba0c7d55..808b1eaa59d1 100644
--- a/drivers/clk/qcom/gpucc-sm4450.c
+++ b/drivers/clk/qcom/gpucc-sm4450.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/clk/qcom/gpucc-sm6115.c b/drivers/clk/qcom/gpucc-sm6115.c
index d43c86cf73a5..a075fa395643 100644
--- a/drivers/clk/qcom/gpucc-sm6115.c
+++ b/drivers/clk/qcom/gpucc-sm6115.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm6125.c b/drivers/clk/qcom/gpucc-sm6125.c
index ed6a6e505801..ecaabd58bc0e 100644
--- a/drivers/clk/qcom/gpucc-sm6125.c
+++ b/drivers/clk/qcom/gpucc-sm6125.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm6350.c b/drivers/clk/qcom/gpucc-sm6350.c
index efbee1518dd3..d27e4ad7be51 100644
--- a/drivers/clk/qcom/gpucc-sm6350.c
+++ b/drivers/clk/qcom/gpucc-sm6350.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm6375.c b/drivers/clk/qcom/gpucc-sm6375.c
index 41f59024143e..eebbc6de28e5 100644
--- a/drivers/clk/qcom/gpucc-sm6375.c
+++ b/drivers/clk/qcom/gpucc-sm6375.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/gpucc-sm8150.c b/drivers/clk/qcom/gpucc-sm8150.c
index 5701031c17f3..8e25b4fc6e52 100644
--- a/drivers/clk/qcom/gpucc-sm8150.c
+++ b/drivers/clk/qcom/gpucc-sm8150.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm8250.c b/drivers/clk/qcom/gpucc-sm8250.c
index eee3208640cd..cc77fd03d11f 100644
--- a/drivers/clk/qcom/gpucc-sm8250.c
+++ b/drivers/clk/qcom/gpucc-sm8250.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm8350.c b/drivers/clk/qcom/gpucc-sm8350.c
index 4025dab0a1ca..6d2660bdd825 100644
--- a/drivers/clk/qcom/gpucc-sm8350.c
+++ b/drivers/clk/qcom/gpucc-sm8350.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm8450.c b/drivers/clk/qcom/gpucc-sm8450.c
index 059df72deaa1..49c4879e74cf 100644
--- a/drivers/clk/qcom/gpucc-sm8450.c
+++ b/drivers/clk/qcom/gpucc-sm8450.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm8550.c b/drivers/clk/qcom/gpucc-sm8550.c
index 7486edf56160..53614e980b26 100644
--- a/drivers/clk/qcom/gpucc-sm8550.c
+++ b/drivers/clk/qcom/gpucc-sm8550.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm8650.c b/drivers/clk/qcom/gpucc-sm8650.c
index f15aeecc512d..a84fa35bc2ba 100644
--- a/drivers/clk/qcom/gpucc-sm8650.c
+++ b/drivers/clk/qcom/gpucc-sm8650.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-sm8750.c b/drivers/clk/qcom/gpucc-sm8750.c
index 5d52c6d8b5e5..88d7fdc87318 100644
--- a/drivers/clk/qcom/gpucc-sm8750.c
+++ b/drivers/clk/qcom/gpucc-sm8750.c
@@ -3,7 +3,6 @@
  * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/gpucc-x1e80100.c b/drivers/clk/qcom/gpucc-x1e80100.c
index 2eec20dd0254..f9161dbaedd7 100644
--- a/drivers/clk/qcom/gpucc-x1e80100.c
+++ b/drivers/clk/qcom/gpucc-x1e80100.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/gpucc-x1p42100.c b/drivers/clk/qcom/gpucc-x1p42100.c
index 4031d3ff560a..cfc34e0fd290 100644
--- a/drivers/clk/qcom/gpucc-x1p42100.c
+++ b/drivers/clk/qcom/gpucc-x1p42100.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/clk/qcom/gxclkctl-kaanapali.c b/drivers/clk/qcom/gxclkctl-kaanapali.c
index 40d856378a74..1b9b10fd10c0 100644
--- a/drivers/clk/qcom/gxclkctl-kaanapali.c
+++ b/drivers/clk/qcom/gxclkctl-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/ipq-cmn-pll.c b/drivers/clk/qcom/ipq-cmn-pll.c
index 5763e4df59a1..82e03ba24834 100644
--- a/drivers/clk/qcom/ipq-cmn-pll.c
+++ b/drivers/clk/qcom/ipq-cmn-pll.c
@@ -42,7 +42,6 @@
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_clock.h>
diff --git a/drivers/clk/qcom/lpasscc-sc8280xp.c b/drivers/clk/qcom/lpasscc-sc8280xp.c
index ff839788c40e..32769281b220 100644
--- a/drivers/clk/qcom/lpasscc-sc8280xp.c
+++ b/drivers/clk/qcom/lpasscc-sc8280xp.c
@@ -6,7 +6,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/clk/qcom/lpasscc-sm6115.c b/drivers/clk/qcom/lpasscc-sm6115.c
index ac6d219233b4..226dc02fc42d 100644
--- a/drivers/clk/qcom/lpasscc-sm6115.c
+++ b/drivers/clk/qcom/lpasscc-sm6115.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c
index 2d334977d783..3affa525b875 100644
--- a/drivers/clk/qcom/mmcc-apq8084.c
+++ b/drivers/clk/qcom/mmcc-apq8084.c
@@ -6,7 +6,6 @@
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c
index cd3c9f8455e5..a23440e13b71 100644
--- a/drivers/clk/qcom/mmcc-msm8960.c
+++ b/drivers/clk/qcom/mmcc-msm8960.c
@@ -8,7 +8,6 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c
index 12bbc49c87af..f2e802cf6afc 100644
--- a/drivers/clk/qcom/mmcc-msm8974.c
+++ b/drivers/clk/qcom/mmcc-msm8974.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/qcom/mmcc-msm8994.c b/drivers/clk/qcom/mmcc-msm8994.c
index 7c0b959a4aa2..0a273630e852 100644
--- a/drivers/clk/qcom/mmcc-msm8994.c
+++ b/drivers/clk/qcom/mmcc-msm8994.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/qcom/mmcc-msm8996.c b/drivers/clk/qcom/mmcc-msm8996.c
index 7d67c6f73fe1..3426e3dde924 100644
--- a/drivers/clk/qcom/mmcc-msm8996.c
+++ b/drivers/clk/qcom/mmcc-msm8996.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/clk-provider.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/mmcc-msm8998.c b/drivers/clk/qcom/mmcc-msm8998.c
index e2f198213b21..5c37be700fa7 100644
--- a/drivers/clk/qcom/mmcc-msm8998.c
+++ b/drivers/clk/qcom/mmcc-msm8998.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/clk-provider.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/mmcc-sdm660.c b/drivers/clk/qcom/mmcc-sdm660.c
index dbd3f561dc6d..200f986de965 100644
--- a/drivers/clk/qcom/mmcc-sdm660.c
+++ b/drivers/clk/qcom/mmcc-sdm660.c
@@ -9,7 +9,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/clk-provider.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/negcc-nord.c b/drivers/clk/qcom/negcc-nord.c
index 1aa24e2784e5..a77909654d84 100644
--- a/drivers/clk/qcom/negcc-nord.c
+++ b/drivers/clk/qcom/negcc-nord.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/nwgcc-nord.c b/drivers/clk/qcom/nwgcc-nord.c
index 163ab63c872b..3e38c9e37824 100644
--- a/drivers/clk/qcom/nwgcc-nord.c
+++ b/drivers/clk/qcom/nwgcc-nord.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/segcc-nord.c b/drivers/clk/qcom/segcc-nord.c
index 1aab0999de4d..f02a036dee06 100644
--- a/drivers/clk/qcom/segcc-nord.c
+++ b/drivers/clk/qcom/segcc-nord.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/tcsrcc-eliza.c b/drivers/clk/qcom/tcsrcc-eliza.c
index 5a47a4c77cb5..127d1f0a1442 100644
--- a/drivers/clk/qcom/tcsrcc-eliza.c
+++ b/drivers/clk/qcom/tcsrcc-eliza.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/tcsrcc-glymur.c b/drivers/clk/qcom/tcsrcc-glymur.c
index 9c0edebcdbb1..b44fccb795c6 100644
--- a/drivers/clk/qcom/tcsrcc-glymur.c
+++ b/drivers/clk/qcom/tcsrcc-glymur.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/tcsrcc-nord.c b/drivers/clk/qcom/tcsrcc-nord.c
index ed0f4909158f..cbe59e8a5b01 100644
--- a/drivers/clk/qcom/tcsrcc-nord.c
+++ b/drivers/clk/qcom/tcsrcc-nord.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/tcsrcc-sm8650.c b/drivers/clk/qcom/tcsrcc-sm8650.c
index 3685dcde9a4b..651e28067954 100644
--- a/drivers/clk/qcom/tcsrcc-sm8650.c
+++ b/drivers/clk/qcom/tcsrcc-sm8650.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/tcsrcc-sm8750.c b/drivers/clk/qcom/tcsrcc-sm8750.c
index 46af98760197..9fe840a448bf 100644
--- a/drivers/clk/qcom/tcsrcc-sm8750.c
+++ b/drivers/clk/qcom/tcsrcc-sm8750.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/tcsrcc-x1e80100.c b/drivers/clk/qcom/tcsrcc-x1e80100.c
index a367e1f55622..0b05c27b619b 100644
--- a/drivers/clk/qcom/tcsrcc-x1e80100.c
+++ b/drivers/clk/qcom/tcsrcc-x1e80100.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-glymur.c b/drivers/clk/qcom/videocc-glymur.c
index bbf13f4ba82d..18313a65e78d 100644
--- a/drivers/clk/qcom/videocc-glymur.c
+++ b/drivers/clk/qcom/videocc-glymur.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-kaanapali.c b/drivers/clk/qcom/videocc-kaanapali.c
index b29e3da465e5..1f4ac18f86fa 100644
--- a/drivers/clk/qcom/videocc-kaanapali.c
+++ b/drivers/clk/qcom/videocc-kaanapali.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-milos.c b/drivers/clk/qcom/videocc-milos.c
index 3cce34e8c71a..386f2e1255d4 100644
--- a/drivers/clk/qcom/videocc-milos.c
+++ b/drivers/clk/qcom/videocc-milos.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-qcs615.c b/drivers/clk/qcom/videocc-qcs615.c
index 3203cb938ad1..3bfea382c3ac 100644
--- a/drivers/clk/qcom/videocc-qcs615.c
+++ b/drivers/clk/qcom/videocc-qcs615.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-sa8775p.c b/drivers/clk/qcom/videocc-sa8775p.c
index 2476201dcd20..65a2d5bafea6 100644
--- a/drivers/clk/qcom/videocc-sa8775p.c
+++ b/drivers/clk/qcom/videocc-sa8775p.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/qcom/videocc-sm7150.c b/drivers/clk/qcom/videocc-sm7150.c
index b6912560ef9b..8d2e00799f96 100644
--- a/drivers/clk/qcom/videocc-sm7150.c
+++ b/drivers/clk/qcom/videocc-sm7150.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-sm8450.c b/drivers/clk/qcom/videocc-sm8450.c
index 18b191f598b5..887044aa3b24 100644
--- a/drivers/clk/qcom/videocc-sm8450.c
+++ b/drivers/clk/qcom/videocc-sm8450.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-sm8550.c b/drivers/clk/qcom/videocc-sm8550.c
index 4e35964f0803..c2f11489a222 100644
--- a/drivers/clk/qcom/videocc-sm8550.c
+++ b/drivers/clk/qcom/videocc-sm8550.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/qcom/videocc-sm8750.c b/drivers/clk/qcom/videocc-sm8750.c
index e9414390a3cc..b62271a7dac6 100644
--- a/drivers/clk/qcom/videocc-sm8750.c
+++ b/drivers/clk/qcom/videocc-sm8750.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/clk/renesas/clk-vbattb.c b/drivers/clk/renesas/clk-vbattb.c
index 2a961775b1d8..bd97a68bed1b 100644
--- a/drivers/clk/renesas/clk-vbattb.c
+++ b/drivers/clk/renesas/clk-vbattb.c
@@ -9,7 +9,6 @@
 #include <linux/clk-provider.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 26ea85cfaa02..31ae6a83df89 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c
index abfd8634d2be..f8e247b6f67e 100644
--- a/drivers/clk/renesas/rzg2l-cpg.c
+++ b/drivers/clk/renesas/rzg2l-cpg.c
@@ -23,7 +23,6 @@
 #include <linux/init.h>
 #include <linux/iopoll.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/clk/renesas/rzv2h-cpg.c b/drivers/clk/renesas/rzv2h-cpg.c
index f6c47fb89bca..e1b40cebc2ea 100644
--- a/drivers/clk/renesas/rzv2h-cpg.c
+++ b/drivers/clk/renesas/rzv2h-cpg.c
@@ -22,7 +22,6 @@
 #include <linux/math.h>
 #include <linux/math64.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/clk/samsung/clk-exynos-audss.c b/drivers/clk/samsung/clk-exynos-audss.c
index 0f5ae3e8d000..e11ac67819ef 100644
--- a/drivers/clk/samsung/clk-exynos-audss.c
+++ b/drivers/clk/samsung/clk-exynos-audss.c
@@ -11,7 +11,6 @@
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/of.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c
index 5b21025338bd..5f64d93b2fac 100644
--- a/drivers/clk/samsung/clk-exynos-clkout.c
+++ b/drivers/clk/samsung/clk-exynos-clkout.c
@@ -10,7 +10,6 @@
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
diff --git a/drivers/clk/samsung/clk-exynos2200.c b/drivers/clk/samsung/clk-exynos2200.c
index eab9f5eecfa3..6a6ac34f90b9 100644
--- a/drivers/clk/samsung/clk-exynos2200.c
+++ b/drivers/clk/samsung/clk-exynos2200.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynos3250.c b/drivers/clk/samsung/clk-exynos3250.c
index 84564ec4c8ec..32d12658e1a9 100644
--- a/drivers/clk/samsung/clk-exynos3250.c
+++ b/drivers/clk/samsung/clk-exynos3250.c
@@ -7,7 +7,6 @@
 
 #include <linux/clk-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/clock/exynos3250.h>
 
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index 246bd28bac2d..eaa8667a6ad5 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -11,7 +11,6 @@
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 
diff --git a/drivers/clk/samsung/clk-exynos4412-isp.c b/drivers/clk/samsung/clk-exynos4412-isp.c
index 772bc18a1e68..0e66f94ceab5 100644
--- a/drivers/clk/samsung/clk-exynos4412-isp.c
+++ b/drivers/clk/samsung/clk-exynos4412-isp.c
@@ -9,7 +9,6 @@
 #include <dt-bindings/clock/exynos4.h>
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/clk/samsung/clk-exynos5-subcmu.c b/drivers/clk/samsung/clk-exynos5-subcmu.c
index 03bbde76e3ce..373129847301 100644
--- a/drivers/clk/samsung/clk-exynos5-subcmu.c
+++ b/drivers/clk/samsung/clk-exynos5-subcmu.c
@@ -5,7 +5,6 @@
 // Common Clock Framework support for Exynos5 power-domain dependent clocks
 
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index f97f30b29be7..802300c945a9 100644
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -10,7 +10,6 @@
 #include <dt-bindings/clock/exynos5250.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 1982e0751cee..400a5c59815c 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -10,7 +10,6 @@
 #include <dt-bindings/clock/exynos5420.h>
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/clk.h>
diff --git a/drivers/clk/samsung/clk-exynos5433.c b/drivers/clk/samsung/clk-exynos5433.c
index 4b2a861e7d57..6bc64e446351 100644
--- a/drivers/clk/samsung/clk-exynos5433.c
+++ b/drivers/clk/samsung/clk-exynos5433.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
diff --git a/drivers/clk/samsung/clk-exynos7870.c b/drivers/clk/samsung/clk-exynos7870.c
index b3bcf3a1d0b7..fd39ec77804a 100644
--- a/drivers/clk/samsung/clk-exynos7870.c
+++ b/drivers/clk/samsung/clk-exynos7870.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynos7885.c b/drivers/clk/samsung/clk-exynos7885.c
index ba7cf79bc300..17c2a4fc1a55 100644
--- a/drivers/clk/samsung/clk-exynos7885.c
+++ b/drivers/clk/samsung/clk-exynos7885.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynos850.c b/drivers/clk/samsung/clk-exynos850.c
index eb9c80b60225..2036007a32cb 100644
--- a/drivers/clk/samsung/clk-exynos850.c
+++ b/drivers/clk/samsung/clk-exynos850.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynos8895.c b/drivers/clk/samsung/clk-exynos8895.c
index e6980a8f026f..259481c4276e 100644
--- a/drivers/clk/samsung/clk-exynos8895.c
+++ b/drivers/clk/samsung/clk-exynos8895.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynos990.c b/drivers/clk/samsung/clk-exynos990.c
index 6277dd557fab..012c212518a6 100644
--- a/drivers/clk/samsung/clk-exynos990.c
+++ b/drivers/clk/samsung/clk-exynos990.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynosautov9.c b/drivers/clk/samsung/clk-exynosautov9.c
index e4d7c7b96aa8..507c92e09ccf 100644
--- a/drivers/clk/samsung/clk-exynosautov9.c
+++ b/drivers/clk/samsung/clk-exynosautov9.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-exynosautov920.c b/drivers/clk/samsung/clk-exynosautov920.c
index 04cd40c71d13..a938f3cc7b57 100644
--- a/drivers/clk/samsung/clk-exynosautov920.c
+++ b/drivers/clk/samsung/clk-exynosautov920.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-fsd.c b/drivers/clk/samsung/clk-fsd.c
index 4124d65e3d18..0a0bf1d62a04 100644
--- a/drivers/clk/samsung/clk-fsd.c
+++ b/drivers/clk/samsung/clk-fsd.c
@@ -11,7 +11,6 @@
 #include <linux/clk-provider.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-gs101.c b/drivers/clk/samsung/clk-gs101.c
index b44bb31f38b3..9a42b44f4f26 100644
--- a/drivers/clk/samsung/clk-gs101.c
+++ b/drivers/clk/samsung/clk-gs101.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/samsung/clk-s5pv210-audss.c b/drivers/clk/samsung/clk-s5pv210-audss.c
index c9fcb23de183..1b83fdd496e9 100644
--- a/drivers/clk/samsung/clk-s5pv210-audss.c
+++ b/drivers/clk/samsung/clk-s5pv210-audss.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/syscore_ops.h>
 #include <linux/init.h>
diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index 91e5cdbc79d7..7f1bc3e31442 100644
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -13,7 +13,6 @@
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/regmap.h>
 #include <linux/syscore_ops.h>
diff --git a/drivers/clk/sprd/ums512-clk.c b/drivers/clk/sprd/ums512-clk.c
index f763d83de9ee..fc17b74b869f 100644
--- a/drivers/clk/sprd/ums512-clk.c
+++ b/drivers/clk/sprd/ums512-clk.c
@@ -9,7 +9,6 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/clk/starfive/clk-starfive-jh7100-audio.c b/drivers/clk/starfive/clk-starfive-jh7100-audio.c
index 7de23f6749aa..de1cf717e391 100644
--- a/drivers/clk/starfive/clk-starfive-jh7100-audio.c
+++ b/drivers/clk/starfive/clk-starfive-jh7100-audio.c
@@ -9,7 +9,6 @@
 #include <linux/clk-provider.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/clk/starfive/clk-starfive-jh7100.c b/drivers/clk/starfive/clk-starfive-jh7100.c
index 03f6f26a15d8..761e46ed0ffd 100644
--- a/drivers/clk/starfive/clk-starfive-jh7100.c
+++ b/drivers/clk/starfive/clk-starfive-jh7100.c
@@ -10,7 +10,6 @@
 #include <linux/clk-provider.h>
 #include <linux/device.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/starfive-jh7100.h>
diff --git a/drivers/clk/tegra/clk-device.c b/drivers/clk/tegra/clk-device.c
index e0531f6dcfb0..a75f71462df2 100644
--- a/drivers/clk/tegra/clk-device.c
+++ b/drivers/clk/tegra/clk-device.c
@@ -2,7 +2,6 @@
 
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
diff --git a/drivers/clk/xilinx/xlnx_vcu.c b/drivers/clk/xilinx/xlnx_vcu.c
index 02699bc0f82c..f14bda375e35 100644
--- a/drivers/clk/xilinx/xlnx_vcu.c
+++ b/drivers/clk/xilinx/xlnx_vcu.c
@@ -16,7 +16,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/mfd/syscon/xlnx-vcu.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/counter/interrupt-cnt.c b/drivers/counter/interrupt-cnt.c
index e6100b5fb082..3c7fdfb0998f 100644
--- a/drivers/counter/interrupt-cnt.c
+++ b/drivers/counter/interrupt-cnt.c
@@ -8,7 +8,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c
index b249c8647639..cbbb1232becd 100644
--- a/drivers/counter/stm32-lptimer-cnt.c
+++ b/drivers/counter/stm32-lptimer-cnt.c
@@ -13,7 +13,6 @@
 #include <linux/bitfield.h>
 #include <linux/counter.h>
 #include <linux/mfd/stm32-lptimer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c
index 3d3384cbea87..a3d8f7a5874e 100644
--- a/drivers/counter/stm32-timer-cnt.c
+++ b/drivers/counter/stm32-timer-cnt.c
@@ -10,7 +10,6 @@
 #include <linux/counter.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/stm32-timers.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pinctrl/consumer.h>
diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
index 3586a7ab9887..f69b6920463f 100644
--- a/drivers/counter/ti-ecap-capture.c
+++ b/drivers/counter/ti-ecap-capture.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/counter/ti-eqep.c b/drivers/counter/ti-eqep.c
index d21c157e531a..d9302ec21163 100644
--- a/drivers/counter/ti-eqep.c
+++ b/drivers/counter/ti-eqep.c
@@ -10,7 +10,6 @@
 #include <linux/counter.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c
index 739d54dc9f2b..e0cd3a9a5f00 100644
--- a/drivers/cpufreq/amd_freq_sensitivity.c
+++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -14,7 +14,6 @@
 #include <linux/pci.h>
 #include <linux/percpu-defs.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 
 #include <asm/msr.h>
 #include <asm/cpufeature.h>
diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
index 1ec54fc4c2ba..79b6b8411b8d 100644
--- a/drivers/cpufreq/armada-37xx-cpufreq.c
+++ b/drivers/cpufreq/armada-37xx-cpufreq.c
@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_opp.h>
diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index b393689400b4..f79d7c456546 100644
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -28,7 +28,6 @@
 #include <linux/irq.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/crypto.h>
 #include <crypto/scatterwalk.h>
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index 8e3b8efa8109..66323ac63406 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -28,7 +28,6 @@
 #include <linux/irq.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/crypto.h>
 #include <crypto/scatterwalk.h>
diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 643e507f9c02..3c0eacacfc87 100644
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -28,7 +28,6 @@
 #include <linux/irq.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/crypto.h>
 #include <crypto/scatterwalk.h>
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 2da0894f31fd..46bcef044606 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index c0467185ee42..0f19dcc2f388 100644
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/scatterlist.h>
 
diff --git a/drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c b/drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
index 48281d882260..87b67060c77b 100644
--- a/drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
+++ b/drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
@@ -16,7 +16,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c
index b966f3365b7d..ac74f69914d6 100644
--- a/drivers/crypto/qce/core.c
+++ b/drivers/crypto/qce/core.c
@@ -10,7 +10,6 @@
 #include <linux/interconnect.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <crypto/algapi.h>
diff --git a/drivers/crypto/starfive/jh7110-cryp.c b/drivers/crypto/starfive/jh7110-cryp.c
index e19cd7945968..842f76b0f114 100644
--- a/drivers/crypto/starfive/jh7110-cryp.c
+++ b/drivers/crypto/starfive/jh7110-cryp.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 584508963241..3a3fd21d2c4d 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -14,7 +14,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/crypto.h>
diff --git a/drivers/crypto/tegra/tegra-se-main.c b/drivers/crypto/tegra/tegra-se-main.c
index d2f518ef9a10..497ff270489c 100644
--- a/drivers/crypto/tegra/tegra-se-main.c
+++ b/drivers/crypto/tegra/tegra-se-main.c
@@ -8,7 +8,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 
 #include <crypto/engine.h>
 
diff --git a/drivers/crypto/ti/dthev2-common.c b/drivers/crypto/ti/dthev2-common.c
index a2ad79bec105..ba6cde75d361 100644
--- a/drivers/crypto/ti/dthev2-common.c
+++ b/drivers/crypto/ti/dthev2-common.c
@@ -21,7 +21,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/scatterlist.h>
 
diff --git a/drivers/crypto/xilinx/zynqmp-aes-gcm.c b/drivers/crypto/xilinx/zynqmp-aes-gcm.c
index 2421bf30556d..d54c268dfe34 100644
--- a/drivers/crypto/xilinx/zynqmp-aes-gcm.c
+++ b/drivers/crypto/xilinx/zynqmp-aes-gcm.c
@@ -15,7 +15,6 @@
 #include <linux/firmware/xlnx-zynqmp.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
 
diff --git a/drivers/devfreq/hisi_uncore_freq.c b/drivers/devfreq/hisi_uncore_freq.c
index 4d00d813c8ac..bef718d6ae35 100644
--- a/drivers/devfreq/hisi_uncore_freq.c
+++ b/drivers/devfreq/hisi_uncore_freq.c
@@ -18,7 +18,6 @@
 #include <linux/ktime.h>
 #include <linux/mailbox_client.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/pm_opp.h>
diff --git a/drivers/devfreq/imx8m-ddrc.c b/drivers/devfreq/imx8m-ddrc.c
index e1348490c8aa..52beeb5b7d65 100644
--- a/drivers/devfreq/imx8m-ddrc.c
+++ b/drivers/devfreq/imx8m-ddrc.c
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/dma/amd/qdma/qdma.c b/drivers/dma/amd/qdma/qdma.c
index f5a02c6ed348..3e61e8c4356a 100644
--- a/drivers/dma/amd/qdma/qdma.c
+++ b/drivers/dma/amd/qdma/qdma.c
@@ -9,7 +9,6 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/amd_qdma.h>
 #include <linux/regmap.h>
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 8eceb96d058c..74af347ac539 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -20,7 +20,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_dma.h>
 #include <linux/overflow.h>
 #include <linux/platform_device.h>
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index 5a8dca8db5ce..623cee78749f 100644
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -45,7 +45,6 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index b3cba11b6203..6f79cc28703e 100644
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -17,7 +17,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
 #include <linux/of_dma.h>
diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c
index f64624ea44ad..fa1173e49900 100644
--- a/drivers/dma/xgene-dma.c
+++ b/drivers/dma/xgene-dma.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c
index 90a22a730cc9..8d4a5d14e8db 100644
--- a/drivers/dma/xilinx/xdma.c
+++ b/drivers/dma/xilinx/xdma.c
@@ -20,7 +20,6 @@
  * user interrupt wires that generate interrupts to the host.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/bitfield.h>
 #include <linux/dmapool.h>
 #include <linux/regmap.h>
diff --git a/drivers/dpll/zl3073x/dpll.c b/drivers/dpll/zl3073x/dpll.c
index 5e58ded5734d..4ab045e85a89 100644
--- a/drivers/dpll/zl3073x/dpll.c
+++ b/drivers/dpll/zl3073x/dpll.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/kthread.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/netlink.h>
 #include <linux/platform_device.h>
diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c
index e4eaec0aa81d..b27dff96aeb6 100644
--- a/drivers/edac/fsl_ddr_edac.c
+++ b/drivers/edac/fsl_ddr_edac.c
@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/ctype.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/edac.h>
 #include <linux/smp.h>
 #include <linux/gfp.h>
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 277f1c6bd522..7bb13f85ce57 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/ctype.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/edac.h>
 #include <linux/smp.h>
 #include <linux/gfp.h>
diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
index af14c8a3279f..ea208c637113 100644
--- a/drivers/edac/pnd2_edac.c
+++ b/drivers/edac/pnd2_edac.c
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/math64.h>
 #include <linux/mmzone.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 35eb7a2038ab..6e248855a549 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -19,7 +19,6 @@
 #include <linux/smp.h>
 #include <linux/bitmap.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
 #include <asm/processor.h>
diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c
index 8131a3d7d562..99a9dfc62e2b 100644
--- a/drivers/extcon/extcon-intel-cht-wc.c
+++ b/drivers/extcon/extcon-intel-cht-wc.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/mfd/intel_soc_pmic.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/property.h>
diff --git a/drivers/extcon/extcon-intel-mrfld.c b/drivers/extcon/extcon-intel-mrfld.c
index 9219f4328d70..7246d704fa3d 100644
--- a/drivers/extcon/extcon-intel-mrfld.c
+++ b/drivers/extcon/extcon-intel-mrfld.c
@@ -10,7 +10,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/intel_soc_pmic.h>
 #include <linux/mfd/intel_soc_pmic_mrfld.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/extcon/extcon-max14526.c b/drivers/extcon/extcon-max14526.c
index 3750a5c20612..bf8997827475 100644
--- a/drivers/extcon/extcon-max14526.c
+++ b/drivers/extcon/extcon-max14526.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/extcon-provider.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pm.h>
diff --git a/drivers/extcon/extcon-max3355.c b/drivers/extcon/extcon-max3355.c
index b2ee4ff8b04d..d687d178aff1 100644
--- a/drivers/extcon/extcon-max3355.c
+++ b/drivers/extcon/extcon-max3355.c
@@ -10,7 +10,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 struct max3355_data {
diff --git a/drivers/extcon/extcon-qcom-spmi-misc.c b/drivers/extcon/extcon-qcom-spmi-misc.c
index afaba5685c3d..3c522c9c92f3 100644
--- a/drivers/extcon/extcon-qcom-spmi-misc.c
+++ b/drivers/extcon/extcon-qcom-spmi-misc.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c
index 5e8ad21ad206..e35fd1f699a6 100644
--- a/drivers/extcon/extcon-usb-gpio.c
+++ b/drivers/extcon/extcon-usb-gpio.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/pinctrl/consumer.h>
-#include <linux/mod_devicetable.h>
 
 #define USB_GPIO_DEBOUNCE_MS	20	/* ms */
 
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index c0f17da27a22..cbac66916240 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -15,7 +15,6 @@
 #include <linux/jiffies.h>
 #include <linux/kobject.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/random.h>
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 82b3b6d9ed2d..e5361f4f8bbd 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -19,7 +19,6 @@
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index 021b8f698e34..31ee94ecb892 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -28,7 +28,6 @@
 #include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/scatterlist.h>
diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbmem.c
index 3397bacdfdbe..995fa2843d4e 100644
--- a/drivers/firmware/google/cbmem.c
+++ b/drivers/firmware/google/cbmem.c
@@ -12,7 +12,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/kobject.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/coreboot.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/google/coreboot_table.c
index 83f7eedf0b3f..4dbbece2f384 100644
--- a/drivers/firmware/google/coreboot_table.c
+++ b/drivers/firmware/google/coreboot_table.c
@@ -14,7 +14,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/coreboot.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/google/framebuffer-coreboot.c
index 2c63a9bd0dcb..e243e15169a3 100644
--- a/drivers/firmware/google/framebuffer-coreboot.c
+++ b/drivers/firmware/google/framebuffer-coreboot.c
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/coreboot.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_data/simplefb.h>
diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/google/memconsole-coreboot.c
index 4aa9b1cad3c3..06956faea92a 100644
--- a/drivers/firmware/google/memconsole-coreboot.c
+++ b/drivers/firmware/google/memconsole-coreboot.c
@@ -10,7 +10,7 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/coreboot.h>
 #include <linux/module.h>
 
 #include "memconsole.h"
diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index dd058291250b..c56999877b33 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/kobject.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/coreboot.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index 0c51a9df589f..891a7b21e4b4 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -28,7 +28,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index 594693ff786e..c24c976117c8 100644
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/fpga/fpga-bridge.h>
diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c
index 9dc263930007..8cde34d6f153 100644
--- a/drivers/fpga/altera-pr-ip-core-plat.c
+++ b/drivers/fpga/altera-pr-ip-core-plat.c
@@ -9,7 +9,6 @@
  */
 #include <linux/fpga/altera-pr-ip-core.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 static int alt_pr_platform_probe(struct platform_device *pdev)
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c
index 62c30266130d..f72d38d9fe4f 100644
--- a/drivers/fpga/ice40-spi.c
+++ b/drivers/fpga/ice40-spi.c
@@ -10,7 +10,6 @@
 
 #include <linux/fpga/fpga-mgr.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/stringify.h>
diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
index b15dab6a39a3..7d23d914df3f 100644
--- a/drivers/fpga/intel-m10-bmc-sec-update.c
+++ b/drivers/fpga/intel-m10-bmc-sec-update.c
@@ -9,7 +9,6 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/mfd/intel-m10-bmc.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/fpga/xilinx-selectmap.c b/drivers/fpga/xilinx-selectmap.c
index 2cd87e7e913f..d0cbb5fdfe3a 100644
--- a/drivers/fpga/xilinx-selectmap.c
+++ b/drivers/fpga/xilinx-selectmap.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c
index e294e3a6cc03..765626cad69a 100644
--- a/drivers/fpga/xilinx-spi.c
+++ b/drivers/fpga/xilinx-spi.c
@@ -13,7 +13,6 @@
 #include "xilinx-core.h"
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/fsi/fsi-master-i2cr.c b/drivers/fsi/fsi-master-i2cr.c
index d36a4328ad73..f76af608c421 100644
--- a/drivers/fsi/fsi-master-i2cr.c
+++ b/drivers/fsi/fsi-master-i2cr.c
@@ -5,7 +5,6 @@
 #include <linux/fsi.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 
 #include "fsi-master-i2cr.h"
diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index bb4d3700c934..1a88ae6742ed 100644
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -10,7 +10,7 @@
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/list.h>
diff --git a/drivers/fsi/i2cr-scom.c b/drivers/fsi/i2cr-scom.c
index 3efca2e944bb..83b3c0348791 100644
--- a/drivers/fsi/i2cr-scom.c
+++ b/drivers/fsi/i2cr-scom.c
@@ -6,7 +6,6 @@
 #include <linux/fs.h>
 #include <linux/fsi.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include "fsi-master-i2cr.h"
 #include "fsi-slave.h"
diff --git a/drivers/gpib/eastwood/fluke_gpib.c b/drivers/gpib/eastwood/fluke_gpib.c
index 2069c771ecef..1363f0a1f570 100644
--- a/drivers/gpib/eastwood/fluke_gpib.c
+++ b/drivers/gpib/eastwood/fluke_gpib.c
@@ -17,7 +17,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/gpio/gpio-74xx-mmio.c b/drivers/gpio/gpio-74xx-mmio.c
index bd2cc5f4f851..cdac37926f8e 100644
--- a/drivers/gpio/gpio-74xx-mmio.c
+++ b/drivers/gpio/gpio-74xx-mmio.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/gpio/driver.h>
 #include <linux/gpio/generic.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index 350feea2afa3..0410e3adbf54 100644
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -7,7 +7,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c
index bc6699a821ee..5ce89f52b4b5 100644
--- a/drivers/gpio/gpio-aggregator.c
+++ b/drivers/gpio/gpio-aggregator.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/lockdep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/overflow.h>
diff --git a/drivers/gpio/gpio-altera-a10sr.c b/drivers/gpio/gpio-altera-a10sr.c
index 4524c18a87e7..47a9ad8ac83d 100644
--- a/drivers/gpio/gpio-altera-a10sr.c
+++ b/drivers/gpio/gpio-altera-a10sr.c
@@ -9,7 +9,7 @@
 
 #include <linux/gpio/driver.h>
 #include <linux/mfd/altera-a10sr.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 
diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c
index fe144360a88d..532e3360b70e 100644
--- a/drivers/gpio/gpio-altera.c
+++ b/drivers/gpio/gpio-altera.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
index 85bd994d15d4..aa37579c9608 100644
--- a/drivers/gpio/gpio-ath79.c
+++ b/drivers/gpio/gpio-ath79.c
@@ -14,7 +14,6 @@
 #include <linux/gpio/machine.h> /* For WLAN GPIOs */
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index b1d32d590cf8..b0beffe48b7d 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/irqdomain.h>
 #include <linux/irqchip/chained_irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
diff --git a/drivers/gpio/gpio-by-pinctrl.c b/drivers/gpio/gpio-by-pinctrl.c
index ddfdc479d38a..7d7c48ce5163 100644
--- a/drivers/gpio/gpio-by-pinctrl.c
+++ b/drivers/gpio/gpio-by-pinctrl.c
@@ -5,7 +5,6 @@
 
 #include <linux/errno.h>
 #include <linux/gpio/driver.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-cros-ec.c b/drivers/gpio/gpio-cros-ec.c
index 9deda8a9d11a..b48b684d817f 100644
--- a/drivers/gpio/gpio-cros-ec.c
+++ b/drivers/gpio/gpio-cros-ec.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/gpio/driver.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index c1f3d83a67c1..7b92b233fafe 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-en7523.c b/drivers/gpio/gpio-en7523.c
index cf47afc578a9..14ad3ca9e623 100644
--- a/drivers/gpio/gpio-en7523.c
+++ b/drivers/gpio/gpio-en7523.c
@@ -5,7 +5,6 @@
 #include <linux/bits.h>
 #include <linux/gpio/driver.h>
 #include <linux/gpio/generic.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
index 66bdff36eb61..d0c8e16f1d48 100644
--- a/drivers/gpio/gpio-ge.c
+++ b/drivers/gpio/gpio-ge.c
@@ -19,7 +19,6 @@
 #include <linux/gpio/generic.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-graniterapids.c b/drivers/gpio/gpio-graniterapids.c
index 121bf29a27f5..2d0fe3abd5e0 100644
--- a/drivers/gpio/gpio-graniterapids.c
+++ b/drivers/gpio/gpio-graniterapids.c
@@ -18,7 +18,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/overflow.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
index d26298c8351b..42d41cf87ac7 100644
--- a/drivers/gpio/gpio-hisi.c
+++ b/drivers/gpio/gpio-hisi.c
@@ -4,7 +4,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/gpio/generic.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
diff --git a/drivers/gpio/gpio-idt3243x.c b/drivers/gpio/gpio-idt3243x.c
index 56f1f1e57b69..031b5c127fd6 100644
--- a/drivers/gpio/gpio-idt3243x.c
+++ b/drivers/gpio/gpio-idt3243x.c
@@ -6,7 +6,6 @@
 #include <linux/gpio/generic.h>
 #include <linux/irq.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 
diff --git a/drivers/gpio/gpio-latch.c b/drivers/gpio/gpio-latch.c
index 452a9ce61488..88757402ea96 100644
--- a/drivers/gpio/gpio-latch.c
+++ b/drivers/gpio/gpio-latch.c
@@ -43,7 +43,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/gpio/driver.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/delay.h>
diff --git a/drivers/gpio/gpio-line-mux.c b/drivers/gpio/gpio-line-mux.c
index 62548fbd3ca0..b4452d956bf0 100644
--- a/drivers/gpio/gpio-line-mux.c
+++ b/drivers/gpio/gpio-line-mux.c
@@ -8,7 +8,6 @@
 
 #include <linux/gpio/consumer.h>
 #include <linux/gpio/driver.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/mux/consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-ltc4283.c b/drivers/gpio/gpio-ltc4283.c
index 6609443c5d62..88aa6216006a 100644
--- a/drivers/gpio/gpio-ltc4283.c
+++ b/drivers/gpio/gpio-ltc4283.c
@@ -11,7 +11,6 @@
 #include <linux/bits.h>
 #include <linux/device.h>
 #include <linux/gpio/driver.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/gpio/gpio-max7360.c b/drivers/gpio/gpio-max7360.c
index db92a43776a9..d12cf1dc8d57 100644
--- a/drivers/gpio/gpio-max7360.c
+++ b/drivers/gpio/gpio-max7360.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/max7360.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-max77759.c b/drivers/gpio/gpio-max77759.c
index c6bdac7fb44a..da3c77dd574e 100644
--- a/drivers/gpio/gpio-max77759.c
+++ b/drivers/gpio/gpio-max77759.c
@@ -14,7 +14,6 @@
 #include <linux/irqreturn.h>
 #include <linux/lockdep.h>
 #include <linux/mfd/max77759.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/overflow.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-mb86s7x.c b/drivers/gpio/gpio-mb86s7x.c
index 581a71872eab..78bcae130e0e 100644
--- a/drivers/gpio/gpio-mb86s7x.c
+++ b/drivers/gpio/gpio-mb86s7x.c
@@ -10,7 +10,6 @@
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c
index 6668686a28ff..4e2f3381d82b 100644
--- a/drivers/gpio/gpio-mlxbf2.c
+++ b/drivers/gpio/gpio-mlxbf2.c
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/gpio/gpio-mmio.c b/drivers/gpio/gpio-mmio.c
index 0941d034a49c..e9c531eef452 100644
--- a/drivers/gpio/gpio-mmio.c
+++ b/drivers/gpio/gpio-mmio.c
@@ -47,7 +47,6 @@ o        `                     ~~~~\___/~~~~    ` controller in FPGA is ,.`
 #include <linux/ioport.h>
 #include <linux/limits.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index 91ff789c4fa6..1c6a2f3414f1 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -18,7 +18,6 @@
 #include <linux/irq_sim.h>
 #include <linux/irqdomain.h>
 #include <linux/limits.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index bfe828734ee1..a6868f673831 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -15,7 +15,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpio/gpio-mpfs.c b/drivers/gpio/gpio-mpfs.c
index 1a4cf213c723..7f0751d7b1c4 100644
--- a/drivers/gpio/gpio-mpfs.c
+++ b/drivers/gpio/gpio-mpfs.c
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/gpio/driver.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c
index e22b713166d7..5dc9f9d5912a 100644
--- a/drivers/gpio/gpio-nomadik.c
+++ b/drivers/gpio/gpio-nomadik.c
@@ -24,7 +24,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 2ee35e855e4d..f6b870b7b352 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index c942b959571b..4196916c4f94 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -13,7 +13,6 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/gpio/gpio-qixis-fpga.c b/drivers/gpio/gpio-qixis-fpga.c
index 3ced47db1521..b590572ac2bd 100644
--- a/drivers/gpio/gpio-qixis-fpga.c
+++ b/drivers/gpio/gpio-qixis-fpga.c
@@ -9,7 +9,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/gpio/regmap.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpio/gpio-realtek-otto.c b/drivers/gpio/gpio-realtek-otto.c
index 37ef56f45318..4a606bad5848 100644
--- a/drivers/gpio/gpio-realtek-otto.c
+++ b/drivers/gpio/gpio-realtek-otto.c
@@ -5,7 +5,6 @@
 #include <linux/gpio/generic.h>
 #include <linux/irq.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpio/gpio-shared-proxy.c b/drivers/gpio/gpio-shared-proxy.c
index 6941e4be6cf1..d3625b8d0ced 100644
--- a/drivers/gpio/gpio-shared-proxy.c
+++ b/drivers/gpio/gpio-shared-proxy.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/gpio/driver.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/string_choices.h>
 #include <linux/types.h>
diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c
index f0f570527cf2..ef1b779e8ea6 100644
--- a/drivers/gpio/gpio-sim.c
+++ b/drivers/gpio/gpio-sim.c
@@ -23,7 +23,6 @@
 #include <linux/list.h>
 #include <linux/lockdep.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
diff --git a/drivers/gpio/gpio-sl28cpld.c b/drivers/gpio/gpio-sl28cpld.c
index 2195f88c2048..ca7a9b9bcf48 100644
--- a/drivers/gpio/gpio-sl28cpld.c
+++ b/drivers/gpio/gpio-sl28cpld.c
@@ -10,7 +10,6 @@
 #include <linux/gpio/regmap.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpio/gpio-sloppy-logic-analyzer.c b/drivers/gpio/gpio-sloppy-logic-analyzer.c
index 969dddd3d6fa..2bbd308ca08e 100644
--- a/drivers/gpio/gpio-sloppy-logic-analyzer.c
+++ b/drivers/gpio/gpio-sloppy-logic-analyzer.c
@@ -20,7 +20,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
 #include <linux/ktime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-sprd.c b/drivers/gpio/gpio-sprd.c
index 2cc8abe705cd..042a83f60eaa 100644
--- a/drivers/gpio/gpio-sprd.c
+++ b/drivers/gpio/gpio-sprd.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/gpio/driver.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
diff --git a/drivers/gpio/gpio-tn48m.c b/drivers/gpio/gpio-tn48m.c
index cd4a80b22794..4fcd0bc24d55 100644
--- a/drivers/gpio/gpio-tn48m.c
+++ b/drivers/gpio/gpio-tn48m.c
@@ -10,7 +10,6 @@
 #include <linux/device.h>
 #include <linux/gpio/driver.h>
 #include <linux/gpio/regmap.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpio/gpio-virtuser.c b/drivers/gpio/gpio-virtuser.c
index 846f8688fec5..7d0d366be37a 100644
--- a/drivers/gpio/gpio-virtuser.c
+++ b/drivers/gpio/gpio-virtuser.c
@@ -23,7 +23,6 @@
 #include <linux/limits.h>
 #include <linux/list.h>
 #include <linux/lockdep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
diff --git a/drivers/gpio/gpio-wcd934x.c b/drivers/gpio/gpio-wcd934x.c
index 572b85e77370..b526493c84e4 100644
--- a/drivers/gpio/gpio-wcd934x.c
+++ b/drivers/gpio/gpio-wcd934x.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2019, Linaro Limited
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/gpio/driver.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-xgene-sb.c b/drivers/gpio/gpio-xgene-sb.c
index 661259f026e1..3675456b1e9b 100644
--- a/drivers/gpio/gpio-xgene-sb.c
+++ b/drivers/gpio/gpio-xgene-sb.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-xra1403.c b/drivers/gpio/gpio-xra1403.c
index 7f3c98f9f902..fe0fba6ea902 100644
--- a/drivers/gpio/gpio-xra1403.c
+++ b/drivers/gpio/gpio-xra1403.c
@@ -8,7 +8,6 @@
 #include <linux/bitops.h>
 #include <linux/gpio/driver.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpio/gpio-zevio.c b/drivers/gpio/gpio-zevio.c
index af0158522ac5..288a86c8294a 100644
--- a/drivers/gpio/gpio-zevio.c
+++ b/drivers/gpio/gpio-zevio.c
@@ -9,7 +9,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
index 46094cca2974..d4577663a1f0 100644
--- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
+++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
@@ -6,7 +6,6 @@
 #include <linux/irq.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
index 8e8cfd66f23b..ea43f59f06b2 100644
--- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
+++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <drm/bridge/dw_hdmi.h>
diff --git a/drivers/gpu/drm/bridge/inno-hdmi.c b/drivers/gpu/drm/bridge/inno-hdmi.c
index 5fa533a4eb34..9a62bf59a403 100644
--- a/drivers/gpu/drm/bridge/inno-hdmi.c
+++ b/drivers/gpu/drm/bridge/inno-hdmi.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/hdmi.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/bridge/ssd2825.c b/drivers/gpu/drm/bridge/ssd2825.c
index 91f1510fc2d4..54ca6bd6883a 100644
--- a/drivers/gpu/drm/bridge/ssd2825.c
+++ b/drivers/gpu/drm/bridge/ssd2825.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc358762.c
index 3d75d9cfa45e..afbfa562b433 100644
--- a/drivers/gpu/drm/bridge/tc358762.c
+++ b/drivers/gpu/drm/bridge/tc358762.c
@@ -12,7 +12,7 @@
 
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c
index 084e9d898e22..8fe6986149f1 100644
--- a/drivers/gpu/drm/bridge/tc358764.c
+++ b/drivers/gpu/drm/bridge/tc358764.c
@@ -9,7 +9,7 @@
 
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/bridge/th1520-dw-hdmi.c b/drivers/gpu/drm/bridge/th1520-dw-hdmi.c
index 389eead5f1c4..cbea8b14cd4b 100644
--- a/drivers/gpu/drm/bridge/th1520-dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/th1520-dw-hdmi.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
diff --git a/drivers/gpu/drm/drm_panel_backlight_quirks.c b/drivers/gpu/drm/drm_panel_backlight_quirks.c
index 537dc6dd0534..f85cb293a3db 100644
--- a/drivers/gpu/drm/drm_panel_backlight_quirks.c
+++ b/drivers/gpu/drm/drm_panel_backlight_quirks.c
@@ -3,7 +3,6 @@
 #include <linux/array_size.h>
 #include <linux/dmi.h>
 #include <linux/export.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_utils.h>
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 552631c3554a..c314b3cb5e70 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/dma-fence.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index e6d516e1976d..d9637ddfcfc4 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -11,7 +11,6 @@
 #include <linux/component.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
index ab3cd309505a..15042365dec0 100644
--- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
+++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
@@ -14,7 +14,6 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/gpu/drm/imagination/pvr_drv.c b/drivers/gpu/drm/imagination/pvr_drv.c
index b20c462bcba0..74477efb40d3 100644
--- a/drivers/gpu/drm/imagination/pvr_drv.c
+++ b/drivers/gpu/drm/imagination/pvr_drv.c
@@ -30,7 +30,6 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/of_device.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-cf.c b/drivers/gpu/drm/imx/dc/dc-cf.c
index 2f077161e912..7c2f7abc5099 100644
--- a/drivers/gpu/drm/imx/dc/dc-cf.c
+++ b/drivers/gpu/drm/imx/dc/dc-cf.c
@@ -7,7 +7,6 @@
 #include <linux/bits.h>
 #include <linux/component.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-de.c b/drivers/gpu/drm/imx/dc/dc-de.c
index 5a3125596fdf..15056590b04d 100644
--- a/drivers/gpu/drm/imx/dc/dc-de.c
+++ b/drivers/gpu/drm/imx/dc/dc-de.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-drv.c b/drivers/gpu/drm/imx/dc/dc-drv.c
index 04f021d2d6cf..13795a2ad735 100644
--- a/drivers/gpu/drm/imx/dc/dc-drv.c
+++ b/drivers/gpu/drm/imx/dc/dc-drv.c
@@ -7,7 +7,6 @@
 #include <linux/component.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-ed.c b/drivers/gpu/drm/imx/dc/dc-ed.c
index d42f33d6f3fc..de1b71315eab 100644
--- a/drivers/gpu/drm/imx/dc/dc-ed.c
+++ b/drivers/gpu/drm/imx/dc/dc-ed.c
@@ -6,7 +6,6 @@
 #include <linux/bitfield.h>
 #include <linux/bits.h>
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-fg.c b/drivers/gpu/drm/imx/dc/dc-fg.c
index 28f372be9247..3741dc66c0d9 100644
--- a/drivers/gpu/drm/imx/dc/dc-fg.c
+++ b/drivers/gpu/drm/imx/dc/dc-fg.c
@@ -9,7 +9,6 @@
 #include <linux/component.h>
 #include <linux/device.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-fl.c b/drivers/gpu/drm/imx/dc/dc-fl.c
index 3ce24c72aa13..9f03df44a63a 100644
--- a/drivers/gpu/drm/imx/dc/dc-fl.c
+++ b/drivers/gpu/drm/imx/dc/dc-fl.c
@@ -5,7 +5,6 @@
 
 #include <linux/component.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-fw.c b/drivers/gpu/drm/imx/dc/dc-fw.c
index acb2d4d9e2ec..14512c01ea78 100644
--- a/drivers/gpu/drm/imx/dc/dc-fw.c
+++ b/drivers/gpu/drm/imx/dc/dc-fw.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-lb.c b/drivers/gpu/drm/imx/dc/dc-lb.c
index ca1d714c8d6e..cb614f3c2f69 100644
--- a/drivers/gpu/drm/imx/dc/dc-lb.c
+++ b/drivers/gpu/drm/imx/dc/dc-lb.c
@@ -6,7 +6,6 @@
 #include <linux/bitfield.h>
 #include <linux/bits.h>
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-pe.c b/drivers/gpu/drm/imx/dc/dc-pe.c
index 6676c22f3f45..4eb8c11de99c 100644
--- a/drivers/gpu/drm/imx/dc/dc-pe.c
+++ b/drivers/gpu/drm/imx/dc/dc-pe.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/gpu/drm/imx/dc/dc-tc.c b/drivers/gpu/drm/imx/dc/dc-tc.c
index 0bfd381b2cea..d0d4faba790e 100644
--- a/drivers/gpu/drm/imx/dc/dc-tc.c
+++ b/drivers/gpu/drm/imx/dc/dc-tc.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c
index f52832b43aca..c67fe80b8115 100644
--- a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c
+++ b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c
@@ -21,7 +21,6 @@
 #include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c
index b8ccd6e55bed..4a40e510e7db 100644
--- a/drivers/gpu/drm/mediatek/mtk_cec.c
+++ b/drivers/gpu/drm/mediatek/mtk_cec.c
@@ -8,7 +8,6 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "mtk_cec.h"
diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
index 7982788ae9df..f903656ea0ef 100644
--- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
@@ -6,7 +6,6 @@
 #include <drm/drm_fourcc.h>
 #include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/soc/mediatek/mtk-cmdq.h>
diff --git a/drivers/gpu/drm/meson/meson_dw_mipi_dsi.c b/drivers/gpu/drm/meson/meson_dw_mipi_dsi.c
index 4412bd678108..867918e9f498 100644
--- a/drivers/gpu/drm/meson/meson_dw_mipi_dsi.c
+++ b/drivers/gpu/drm/meson/meson_dw_mipi_dsi.c
@@ -7,7 +7,6 @@
 
 #include <linux/clk.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 0b756da2fec2..9b8fbda85d28 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -12,7 +12,6 @@
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c
index ea5119018df4..cffee9838324 100644
--- a/drivers/gpu/drm/panel/panel-arm-versatile.c
+++ b/drivers/gpu/drm/panel/panel-arm-versatile.c
@@ -30,7 +30,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/panel/panel-auo-a030jtn01.c b/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
index 6e52bf6830e1..d71850b24ffa 100644
--- a/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
+++ b/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/media-bus-format.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-boe-td4320.c b/drivers/gpu/drm/panel/panel-boe-td4320.c
index 1956daa2c71b..783bce29209d 100644
--- a/drivers/gpu/drm/panel/panel-boe-td4320.c
+++ b/drivers/gpu/drm/panel/panel-boe-td4320.c
@@ -5,7 +5,7 @@
 
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c b/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
index 6225501cb174..46e6e52f9b96 100644
--- a/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
+++ b/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
@@ -5,7 +5,7 @@
 
 #include <linux/gpio/consumer.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
index dbdb7e3cb7b6..594c0b485d79 100644
--- a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+++ b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
@@ -11,7 +11,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/regulator/consumer.h>
 
 #define FEIYANG_INIT_CMD_LEN	2
diff --git a/drivers/gpu/drm/panel/panel-himax-hx83112b.c b/drivers/gpu/drm/panel/panel-himax-hx83112b.c
index 263f79a967de..41f21f8c1373 100644
--- a/drivers/gpu/drm/panel/panel-himax-hx83112b.c
+++ b/drivers/gpu/drm/panel/panel-himax-hx83112b.c
@@ -7,7 +7,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-himax-hx83121a.c b/drivers/gpu/drm/panel/panel-himax-hx83121a.c
index bed79aa06f46..8b11fce4c7c5 100644
--- a/drivers/gpu/drm/panel/panel-himax-hx83121a.c
+++ b/drivers/gpu/drm/panel/panel-himax-hx83121a.c
@@ -9,7 +9,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
diff --git a/drivers/gpu/drm/panel/panel-himax-hx8394.c b/drivers/gpu/drm/panel/panel-himax-hx8394.c
index bf80354567df..416203da2f45 100644
--- a/drivers/gpu/drm/panel/panel-himax-hx8394.c
+++ b/drivers/gpu/drm/panel/panel-himax-hx8394.c
@@ -13,7 +13,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/media-bus-format.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-hydis-hv101hd1.c b/drivers/gpu/drm/panel/panel-hydis-hv101hd1.c
index 46426c388932..088a6998b9e5 100644
--- a/drivers/gpu/drm/panel/panel-hydis-hv101hd1.c
+++ b/drivers/gpu/drm/panel/panel-hydis-hv101hd1.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
index f7425dfaa50d..8115a3158492 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
@@ -19,7 +19,6 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c b/drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c
index ecdbed8d4a3a..ad33414719fc 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c
@@ -4,7 +4,6 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 
diff --git a/drivers/gpu/drm/panel/panel-lg-ld070wx3.c b/drivers/gpu/drm/panel/panel-lg-ld070wx3.c
index 00cbfc5518a5..814dd7def9eb 100644
--- a/drivers/gpu/drm/panel/panel-lg-ld070wx3.c
+++ b/drivers/gpu/drm/panel/panel-lg-ld070wx3.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-motorola-mot.c b/drivers/gpu/drm/panel/panel-motorola-mot.c
index eb1f86c3d704..c9cd1ed88b71 100644
--- a/drivers/gpu/drm/panel/panel-motorola-mot.c
+++ b/drivers/gpu/drm/panel/panel-motorola-mot.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35532.c b/drivers/gpu/drm/panel/panel-novatek-nt35532.c
index 184f61bca7ca..696ad6971fc9 100644
--- a/drivers/gpu/drm/panel/panel-novatek-nt35532.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt35532.c
@@ -6,7 +6,7 @@
 
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-novatek-nt37801.c b/drivers/gpu/drm/panel/panel-novatek-nt37801.c
index d6a37d7e0cc6..861e999250f9 100644
--- a/drivers/gpu/drm/panel/panel-novatek-nt37801.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt37801.c
@@ -5,7 +5,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include <drm/display/drm_dsc.h>
diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
index 60701521c3b1..130520558a81 100644
--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
@@ -9,7 +9,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-raydium-rm67200.c b/drivers/gpu/drm/panel/panel-raydium-rm67200.c
index 333faed62da7..f7859086f761 100644
--- a/drivers/gpu/drm/panel/panel-raydium-rm67200.c
+++ b/drivers/gpu/drm/panel/panel-raydium-rm67200.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-raydium-rm68200.c b/drivers/gpu/drm/panel/panel-raydium-rm68200.c
index 669b5f5c1ad9..a06431062ca4 100644
--- a/drivers/gpu/drm/panel/panel-raydium-rm68200.c
+++ b/drivers/gpu/drm/panel/panel-raydium-rm68200.c
@@ -8,7 +8,7 @@
 
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-renesas-r61307.c b/drivers/gpu/drm/panel/panel-renesas-r61307.c
index d8185cc1b5d6..8b756666c875 100644
--- a/drivers/gpu/drm/panel/panel-renesas-r61307.c
+++ b/drivers/gpu/drm/panel/panel-renesas-r61307.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-renesas-r69328.c b/drivers/gpu/drm/panel/panel-renesas-r69328.c
index bfe2787f8f53..aad43a385dfd 100644
--- a/drivers/gpu/drm/panel/panel-renesas-r69328.c
+++ b/drivers/gpu/drm/panel/panel-renesas-r69328.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c b/drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c
index 1618841b7caa..976b404724bc 100644
--- a/drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c
+++ b/drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c
@@ -4,7 +4,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
index ba1a02000bb9..f143384e64b6 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
@@ -11,7 +11,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 
 struct s6d16d0 {
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
index 6f3d39556f92..e05199ce14ee 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
@@ -11,7 +11,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
index a89d925fdfb2..608f054545df 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
@@ -6,7 +6,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_print.h>
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams427ap24.c b/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams427ap24.c
index 7e2f4e043d62..77fee36dbb55 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams427ap24.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams427ap24.c
@@ -7,7 +7,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c b/drivers/gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c
index 199ff99efd78..2fae0dc6c424 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c
@@ -7,7 +7,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
index 6c348fe28955..f1641c9c7d13 100644
--- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@ -11,7 +11,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/media-bus-format.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/gpu/drm/panel/panel-summit.c b/drivers/gpu/drm/panel/panel-summit.c
index 6d40b9ddfe02..84435be52424 100644
--- a/drivers/gpu/drm/panel/panel-summit.c
+++ b/drivers/gpu/drm/panel/panel-summit.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <linux/backlight.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <drm/drm_device.h>
 #include <drm/drm_mipi_dsi.h>
diff --git a/drivers/gpu/drm/panel/panel-visionox-rm69299.c b/drivers/gpu/drm/panel/panel-visionox-rm69299.c
index f1430370ff94..50f8a84537ca 100644
--- a/drivers/gpu/drm/panel/panel-visionox-rm69299.c
+++ b/drivers/gpu/drm/panel/panel-visionox-rm69299.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/property.h>
-#include <linux/mod_devicetable.h>
 #include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/panel/panel-visionox-rm692e5.c b/drivers/gpu/drm/panel/panel-visionox-rm692e5.c
index e53645d59413..9567a6125565 100644
--- a/drivers/gpu/drm/panel/panel-visionox-rm692e5.c
+++ b/drivers/gpu/drm/panel/panel-visionox-rm692e5.c
@@ -9,7 +9,6 @@
 #include <linux/backlight.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c
index c0176e5de9a8..8e7fac7a893b 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c
@@ -7,7 +7,6 @@
  * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
index d2e76d36d724..a2810e16765c 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
@@ -10,7 +10,6 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/media-bus-format.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c
index 45a6dae4de31..33ff195bd2e6 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/hw_bitfield.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
index 02a788a4dfdd..17eda592b183 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <linux/hw_bitfield.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <drm/drm_blend.h>
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index b2f8ebf90968..72301e0a3e0a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/sprd/sprd_drm.c b/drivers/gpu/drm/sprd/sprd_drm.c
index ceacdcb7c566..c2fd5380a834 100644
--- a/drivers/gpu/drm/sprd/sprd_drm.c
+++ b/drivers/gpu/drm/sprd/sprd_drm.c
@@ -5,7 +5,6 @@
 
 #include <linux/component.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of_graph.h>
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index 360a88ca8f0c..b9f8f68f01f9 100644
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
index 144b7cda989a..0967b9b3451d 100644
--- a/drivers/gpu/drm/stm/drv.c
+++ b/drivers/gpu/drm/stm/drv.c
@@ -11,7 +11,6 @@
 #include <linux/aperture.h>
 #include <linux/component.h>
 #include <linux/dma-mapping.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
index 58eae6804cc8..a3eae5b2c26e 100644
--- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
+++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
@@ -10,7 +10,6 @@
 #include <linux/clk-provider.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpu/drm/sun4i/sun6i_drc.c b/drivers/gpu/drm/sun4i/sun6i_drc.c
index 310c7e0daede..0050c1b46ea8 100644
--- a/drivers/gpu/drm/sun4i/sun6i_drc.c
+++ b/drivers/gpu/drm/sun4i/sun6i_drc.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index e7f675c15c20..1d6c9a423a41 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -6,7 +6,6 @@
 
 /* LCDC DRM driver, based on da8xx-fb */
 
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/gpu/drm/tiny/sharp-memory.c b/drivers/gpu/drm/tiny/sharp-memory.c
index 506e6432e70d..7efd7b567f3b 100644
--- a/drivers/gpu/drm/tiny/sharp-memory.c
+++ b/drivers/gpu/drm/tiny/sharp-memory.c
@@ -21,7 +21,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kthread.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pwm.h>
diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
index 2afc88394d64..53f36626a50d 100644
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -23,7 +23,6 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/media-bus-format.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index 66b6f2acf862..bc3f366fc3e6 100644
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -9,7 +9,6 @@
 
 #include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
index 210f17c3a0be..83b9bc4b02e6 100644
--- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
+++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
@@ -9,7 +9,6 @@
 
 #include <linux/types.h>
 #include <linux/dmi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/hid.h>
 
 #include "i2c-hid.h"
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
index 99904312879b..98810bfd1ca8 100644
--- a/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -7,7 +7,6 @@
  * Contact: Carlos Chinea <carlos.chinea@nokia.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/hte/hte-tegra194-test.c b/drivers/hte/hte-tegra194-test.c
index 94e931f45305..32907d951ec9 100644
--- a/drivers/hte/hte-tegra194-test.c
+++ b/drivers/hte/hte-tegra194-test.c
@@ -9,7 +9,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/hte.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/timer.h>
diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c
index de37bce24fa6..937fd9ef98b1 100644
--- a/drivers/hwmon/adcxx.c
+++ b/drivers/hwmon/adcxx.c
@@ -31,7 +31,6 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/mutex.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 #define DRVNAME		"adcxx"
diff --git a/drivers/hwmon/adt7410.c b/drivers/hwmon/adt7410.c
index 0aa7ce0a04be..6629b83aab08 100644
--- a/drivers/hwmon/adt7410.c
+++ b/drivers/hwmon/adt7410.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c
index 31cf9e3bb04f..376331f7fa17 100644
--- a/drivers/hwmon/adt7462.c
+++ b/drivers/hwmon/adt7462.c
@@ -12,7 +12,6 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/log2.h>
 #include <linux/slab.h>
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
index 7241fc73d21a..cd0b69ecb640 100644
--- a/drivers/hwmon/adt7475.c
+++ b/drivers/hwmon/adt7475.c
@@ -19,7 +19,6 @@
 #include <linux/err.h>
 #include <linux/jiffies.h>
 #include <linux/of.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/util_macros.h>
 
diff --git a/drivers/hwmon/as370-hwmon.c b/drivers/hwmon/as370-hwmon.c
index 316454bd983d..702449c0fb86 100644
--- a/drivers/hwmon/as370-hwmon.c
+++ b/drivers/hwmon/as370-hwmon.c
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #define CTRL		0x0
diff --git a/drivers/hwmon/axi-fan-control.c b/drivers/hwmon/axi-fan-control.c
index 01590dfa55e6..1cb481a1ad26 100644
--- a/drivers/hwmon/axi-fan-control.c
+++ b/drivers/hwmon/axi-fan-control.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
diff --git a/drivers/hwmon/cros_ec_hwmon.c b/drivers/hwmon/cros_ec_hwmon.c
index ea24056ae646..03bfcc40bb7c 100644
--- a/drivers/hwmon/cros_ec_hwmon.c
+++ b/drivers/hwmon/cros_ec_hwmon.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/hwmon.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/hwmon/gxp-fan-ctrl.c b/drivers/hwmon/gxp-fan-ctrl.c
index 00e057050437..86e7bafd3a38 100644
--- a/drivers/hwmon/gxp-fan-ctrl.c
+++ b/drivers/hwmon/gxp-fan-ctrl.c
@@ -6,7 +6,6 @@
 #include <linux/hwmon.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #define OFS_FAN_INST	0 /* Is 0 because plreg base will be set at INST */
diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
index e376d4cde5ad..fc17ad93a376 100644
--- a/drivers/hwmon/iio_hwmon.c
+++ b/drivers/hwmon/iio_hwmon.c
@@ -6,7 +6,6 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
index e85d42a45113..d75303ed93e5 100644
--- a/drivers/hwmon/intel-m10-bmc-hwmon.c
+++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
@@ -9,7 +9,6 @@
 #include <linux/hwmon.h>
 #include <linux/mfd/intel-m10-bmc.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 struct m10bmc_sdata {
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index 77fece680358..f6cae24cca9e 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -11,7 +11,6 @@
 
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/hwmon/lan966x-hwmon.c b/drivers/hwmon/lan966x-hwmon.c
index 7247c03e4f44..4071bc2afa32 100644
--- a/drivers/hwmon/lan966x-hwmon.c
+++ b/drivers/hwmon/lan966x-hwmon.c
@@ -5,7 +5,6 @@
 #include <linux/hwmon.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/polynomial.h>
 #include <linux/regmap.h>
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c
index 0d5a250cb672..8b525725fef4 100644
--- a/drivers/hwmon/lm70.c
+++ b/drivers/hwmon/lm70.c
@@ -21,7 +21,6 @@
 #include <linux/sysfs.h>
 #include <linux/hwmon.h>
 #include <linux/mutex.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 104149a03bad..2d2d752aeac9 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -14,7 +14,6 @@
 #include <linux/i3c/device.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/util_macros.h>
diff --git a/drivers/hwmon/ltc2947-core.c b/drivers/hwmon/ltc2947-core.c
index ad7120d1e469..6eba857d4ef8 100644
--- a/drivers/hwmon/ltc2947-core.c
+++ b/drivers/hwmon/ltc2947-core.c
@@ -11,7 +11,6 @@
 #include <linux/hwmon.h>
 #include <linux/module.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/hwmon/ltc4282.c b/drivers/hwmon/ltc4282.c
index b9084424160d..39b9d3abca99 100644
--- a/drivers/hwmon/ltc4282.c
+++ b/drivers/hwmon/ltc4282.c
@@ -16,7 +16,6 @@
 #include <linux/math.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/property.h>
 #include <linux/string.h>
diff --git a/drivers/hwmon/ltc4283.c b/drivers/hwmon/ltc4283.c
index d8931c9a4685..9b85293ea664 100644
--- a/drivers/hwmon/ltc4283.c
+++ b/drivers/hwmon/ltc4283.c
@@ -20,7 +20,6 @@
 #include <linux/minmax.h>
 #include <linux/module.h>
 
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/unaligned.h>
diff --git a/drivers/hwmon/ltq-cputemp.c b/drivers/hwmon/ltq-cputemp.c
index f7e4a4ca5239..b3424d72cb2b 100644
--- a/drivers/hwmon/ltq-cputemp.c
+++ b/drivers/hwmon/ltq-cputemp.c
@@ -9,7 +9,6 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c
index 9b6ab050db1b..0d315087b504 100644
--- a/drivers/hwmon/max197.c
+++ b/drivers/hwmon/max197.c
@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13783-adc.c
index 66304d48d33a..b217b39a046a 100644
--- a/drivers/hwmon/mc13783-adc.c
+++ b/drivers/hwmon/mc13783-adc.c
@@ -11,7 +11,6 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/hwmon.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
index 32c1e42e1278..449f2ce13a2d 100644
--- a/drivers/hwmon/mr75203.c
+++ b/drivers/hwmon/mr75203.c
@@ -13,7 +13,6 @@
 #include <linux/hwmon.h>
 #include <linux/kstrtox.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
index 6f82a6c49393..1ac0288fbbd8 100644
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
@@ -9,7 +9,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/err.h>
diff --git a/drivers/hwmon/occ/p9_sbe.c b/drivers/hwmon/occ/p9_sbe.c
index 1e3749dfa598..4b4cbba58d79 100644
--- a/drivers/hwmon/occ/p9_sbe.c
+++ b/drivers/hwmon/occ/p9_sbe.c
@@ -7,7 +7,6 @@
 #include <linux/fsi-occ.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
diff --git a/drivers/hwmon/pmbus/adp1050.c b/drivers/hwmon/pmbus/adp1050.c
index a73774f8da2d..c3ad33024df9 100644
--- a/drivers/hwmon/pmbus/adp1050.c
+++ b/drivers/hwmon/pmbus/adp1050.c
@@ -6,7 +6,6 @@
  */
 #include <linux/bits.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/e50sn12051.c b/drivers/hwmon/pmbus/e50sn12051.c
index efb4d62b2603..abad39bdbd37 100644
--- a/drivers/hwmon/pmbus/e50sn12051.c
+++ b/drivers/hwmon/pmbus/e50sn12051.c
@@ -5,7 +5,6 @@
 
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include "pmbus.h"
 
 static struct pmbus_driver_info e50sn12051_info = {
diff --git a/drivers/hwmon/pmbus/lt3074.c b/drivers/hwmon/pmbus/lt3074.c
index ed932ddb4f77..a7f9edf02511 100644
--- a/drivers/hwmon/pmbus/lt3074.c
+++ b/drivers/hwmon/pmbus/lt3074.c
@@ -6,7 +6,6 @@
  */
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/max17616.c b/drivers/hwmon/pmbus/max17616.c
index 744fa5aefe93..7636bbf06c6f 100644
--- a/drivers/hwmon/pmbus/max17616.c
+++ b/drivers/hwmon/pmbus/max17616.c
@@ -7,7 +7,6 @@
 
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/max20830.c b/drivers/hwmon/pmbus/max20830.c
index cb2c23672166..e3470118fd36 100644
--- a/drivers/hwmon/pmbus/max20830.c
+++ b/drivers/hwmon/pmbus/max20830.c
@@ -7,7 +7,6 @@
 
 #include <linux/errno.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/mp2975.c b/drivers/hwmon/pmbus/mp2975.c
index dca7e2fbcb44..5393f7aeea0f 100644
--- a/drivers/hwmon/pmbus/mp2975.c
+++ b/drivers/hwmon/pmbus/mp2975.c
@@ -10,7 +10,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/stef48h28.c b/drivers/hwmon/pmbus/stef48h28.c
index 8e48dd3ba74b..6aa536c37c75 100644
--- a/drivers/hwmon/pmbus/stef48h28.c
+++ b/drivers/hwmon/pmbus/stef48h28.c
@@ -5,7 +5,6 @@
 
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pmbus.h"
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index e6a567d58579..37f37813ea51 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -10,7 +10,6 @@
 #include <linux/delay.h>
 #include <linux/hwmon.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c
index 33e997b5c1f5..04e701ce2e74 100644
--- a/drivers/hwmon/sch5627.c
+++ b/drivers/hwmon/sch5627.c
@@ -9,7 +9,6 @@
 #include <linux/bits.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/init.h>
 #include <linux/regmap.h>
diff --git a/drivers/hwmon/sch5636.c b/drivers/hwmon/sch5636.c
index d00bd5cc6b15..8c9b6e24d09f 100644
--- a/drivers/hwmon/sch5636.c
+++ b/drivers/hwmon/sch5636.c
@@ -7,7 +7,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
diff --git a/drivers/hwmon/sl28cpld-hwmon.c b/drivers/hwmon/sl28cpld-hwmon.c
index 454cc844fb9d..9c83b4f2a34b 100644
--- a/drivers/hwmon/sl28cpld-hwmon.c
+++ b/drivers/hwmon/sl28cpld-hwmon.c
@@ -8,7 +8,6 @@
 #include <linux/bitfield.h>
 #include <linux/hwmon.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/hwmon/smpro-hwmon.c b/drivers/hwmon/smpro-hwmon.c
index d320adbd47f4..37d859f6c8f3 100644
--- a/drivers/hwmon/smpro-hwmon.c
+++ b/drivers/hwmon/smpro-hwmon.c
@@ -9,7 +9,6 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
index d640904939cd..aa9178073744 100644
--- a/drivers/hwmon/sparx5-temp.c
+++ b/drivers/hwmon/sparx5-temp.c
@@ -9,7 +9,6 @@
 #include <linux/hwmon.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 6bd1bed3cdb8..95fb912a1f7e 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -15,7 +15,6 @@
 #include <linux/jiffies.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #define	DRIVER_NAME "tmp102"
diff --git a/drivers/hwmon/tmp108.c b/drivers/hwmon/tmp108.c
index 1c4a58855e2d..9fa31bd66ff6 100644
--- a/drivers/hwmon/tmp108.c
+++ b/drivers/hwmon/tmp108.c
@@ -9,7 +9,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/hwmon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/i3c/device.h>
diff --git a/drivers/hwtracing/coresight/ultrasoc-smb.c b/drivers/hwtracing/coresight/ultrasoc-smb.c
index 5776f63468fa..220b099eb5bc 100644
--- a/drivers/hwtracing/coresight/ultrasoc-smb.c
+++ b/drivers/hwtracing/coresight/ultrasoc-smb.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "coresight-etm-perf.h"
diff --git a/drivers/i2c/busses/i2c-amd-asf-plat.c b/drivers/i2c/busses/i2c-amd-asf-plat.c
index ca45f0f23321..82cbc8fb5c18 100644
--- a/drivers/i2c/busses/i2c-amd-asf-plat.c
+++ b/drivers/i2c/busses/i2c-amd-asf-plat.c
@@ -18,7 +18,6 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/sprintf.h>
 
diff --git a/drivers/i2c/busses/i2c-gxp.c b/drivers/i2c/busses/i2c-gxp.c
index 2d117e7e3cb6..f9a5465f52da 100644
--- a/drivers/i2c/busses/i2c-gxp.c
+++ b/drivers/i2c/busses/i2c-gxp.c
@@ -4,7 +4,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c
index 4b735ad9e193..04d7978cae04 100644
--- a/drivers/i2c/busses/i2c-hisi.c
+++ b/drivers/i2c/busses/i2c-hisi.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/units.h>
diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
index 8cedffbb2964..3a8225b0666c 100644
--- a/drivers/i2c/busses/i2c-rtl9300.c
+++ b/drivers/i2c/busses/i2c-rtl9300.c
@@ -4,7 +4,6 @@
 #include <linux/clk.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mfd/syscon.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/i2c/busses/i2c-rzv2m.c b/drivers/i2c/busses/i2c-rzv2m.c
index 238714850673..4ba8eaa322e5 100644
--- a/drivers/i2c/busses/i2c-rzv2m.c
+++ b/drivers/i2c/busses/i2c-rzv2m.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
diff --git a/drivers/iio/accel/adxl313_i2c.c b/drivers/iio/accel/adxl313_i2c.c
index b67ff0b4dc54..d70c1f552e55 100644
--- a/drivers/iio/accel/adxl313_i2c.c
+++ b/drivers/iio/accel/adxl313_i2c.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/adxl313_spi.c b/drivers/iio/accel/adxl313_spi.c
index dedb0885c277..5b6600c55ab2 100644
--- a/drivers/iio/accel/adxl313_spi.c
+++ b/drivers/iio/accel/adxl313_spi.c
@@ -7,7 +7,6 @@
  * Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADXL313.pdf
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/accel/adxl355_core.c b/drivers/iio/accel/adxl355_core.c
index 8f90c58f4100..436312a31eb6 100644
--- a/drivers/iio/accel/adxl355_core.c
+++ b/drivers/iio/accel/adxl355_core.c
@@ -17,7 +17,6 @@
 #include <linux/limits.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/units.h>
diff --git a/drivers/iio/accel/adxl355_i2c.c b/drivers/iio/accel/adxl355_i2c.c
index 1a512c7b792b..4620738aa2d8 100644
--- a/drivers/iio/accel/adxl355_i2c.c
+++ b/drivers/iio/accel/adxl355_i2c.c
@@ -7,7 +7,6 @@
 
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 
 #include "adxl355.h"
diff --git a/drivers/iio/accel/adxl355_spi.c b/drivers/iio/accel/adxl355_spi.c
index 869e3e57d6f7..cacb9cb6fd13 100644
--- a/drivers/iio/accel/adxl355_spi.c
+++ b/drivers/iio/accel/adxl355_spi.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/property.h>
diff --git a/drivers/iio/accel/adxl367.c b/drivers/iio/accel/adxl367.c
index 0c04b2bb7efb..2ed5593bccdb 100644
--- a/drivers/iio/accel/adxl367.c
+++ b/drivers/iio/accel/adxl367.c
@@ -13,7 +13,6 @@
 #include <linux/iio/sysfs.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/unaligned.h>
diff --git a/drivers/iio/accel/adxl367_i2c.c b/drivers/iio/accel/adxl367_i2c.c
index 1c7d2eb054a2..45dfeb4bfd3d 100644
--- a/drivers/iio/accel/adxl367_i2c.c
+++ b/drivers/iio/accel/adxl367_i2c.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/adxl367_spi.c b/drivers/iio/accel/adxl367_spi.c
index 3fed56bb9054..785652c7fc92 100644
--- a/drivers/iio/accel/adxl367_spi.c
+++ b/drivers/iio/accel/adxl367_spi.c
@@ -4,7 +4,6 @@
  * Author: Cosmin Tanislav <cosmin.tanislav@analog.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/accel/adxl372_i2c.c b/drivers/iio/accel/adxl372_i2c.c
index ca2cabf24938..7a0fa92964e6 100644
--- a/drivers/iio/accel/adxl372_i2c.c
+++ b/drivers/iio/accel/adxl372_i2c.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/adxl372_spi.c b/drivers/iio/accel/adxl372_spi.c
index 1f9c1544e547..25fdb4254372 100644
--- a/drivers/iio/accel/adxl372_spi.c
+++ b/drivers/iio/accel/adxl372_spi.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/iio/accel/adxl380_i2c.c b/drivers/iio/accel/adxl380_i2c.c
index bd8782d08c7d..9f3a0f9e0699 100644
--- a/drivers/iio/accel/adxl380_i2c.c
+++ b/drivers/iio/accel/adxl380_i2c.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/adxl380_spi.c b/drivers/iio/accel/adxl380_spi.c
index 4ead949b24f1..ee3e6338b53d 100644
--- a/drivers/iio/accel/adxl380_spi.c
+++ b/drivers/iio/accel/adxl380_spi.c
@@ -5,7 +5,6 @@
  * Copyright 2024 Analog Devices Inc.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 7bc6761f5135..29f7022b526f 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/accel/bma220_core.c b/drivers/iio/accel/bma220_core.c
index f32d875b994e..269e2b720ddb 100644
--- a/drivers/iio/accel/bma220_core.c
+++ b/drivers/iio/accel/bma220_core.c
@@ -11,7 +11,6 @@
 #include <linux/cleanup.h>
 #include <linux/device.h>
 #include <linux/errno.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
diff --git a/drivers/iio/accel/bma220_i2c.c b/drivers/iio/accel/bma220_i2c.c
index 8b6f8e305c8c..4573113647f6 100644
--- a/drivers/iio/accel/bma220_i2c.c
+++ b/drivers/iio/accel/bma220_i2c.c
@@ -10,7 +10,6 @@
 
 #include <linux/bitfield.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
diff --git a/drivers/iio/accel/bma220_spi.c b/drivers/iio/accel/bma220_spi.c
index 383ee8a135ee..d897aec1c9f2 100644
--- a/drivers/iio/accel/bma220_spi.c
+++ b/drivers/iio/accel/bma220_spi.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2016,2020 Intel Corporation.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
diff --git a/drivers/iio/accel/bma400_i2c.c b/drivers/iio/accel/bma400_i2c.c
index 24a390c3ae66..6094db08128c 100644
--- a/drivers/iio/accel/bma400_i2c.c
+++ b/drivers/iio/accel/bma400_i2c.c
@@ -7,7 +7,6 @@
  * I2C address is either 0x14 or 0x15 depending on SDO
  */
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c
index d386f643515b..4b89e313704f 100644
--- a/drivers/iio/accel/bma400_spi.c
+++ b/drivers/iio/accel/bma400_spi.c
@@ -7,7 +7,6 @@
  */
 #include <linux/bits.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
index b4604f441553..eb7241bd9487 100644
--- a/drivers/iio/accel/bmc150-accel-i2c.c
+++ b/drivers/iio/accel/bmc150-accel-i2c.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/acpi.h>
diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c
index 26ce50b37716..7d2be6f63538 100644
--- a/drivers/iio/accel/bmc150-accel-spi.c
+++ b/drivers/iio/accel/bmc150-accel-spi.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/accel/bmi088-accel-i2c.c b/drivers/iio/accel/bmi088-accel-i2c.c
index 310f863029bb..15a14bd7154e 100644
--- a/drivers/iio/accel/bmi088-accel-i2c.c
+++ b/drivers/iio/accel/bmi088-accel-i2c.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
diff --git a/drivers/iio/accel/dmard06.c b/drivers/iio/accel/dmard06.c
index 33f225d73e7b..65a8875ccd8a 100644
--- a/drivers/iio/accel/dmard06.c
+++ b/drivers/iio/accel/dmard06.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
index 8763e91c63d2..d0c2a8daef0d 100644
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@ -17,7 +17,6 @@
 #include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/accel/fxls8962af-i2c.c b/drivers/iio/accel/fxls8962af-i2c.c
index 106198a12474..0114f40caa8a 100644
--- a/drivers/iio/accel/fxls8962af-i2c.c
+++ b/drivers/iio/accel/fxls8962af-i2c.c
@@ -8,7 +8,6 @@
 #include <linux/dev_printk.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/fxls8962af-spi.c b/drivers/iio/accel/fxls8962af-spi.c
index bdafd1f615d9..8936032526a0 100644
--- a/drivers/iio/accel/fxls8962af-spi.c
+++ b/drivers/iio/accel/fxls8962af-spi.c
@@ -8,7 +8,6 @@
 #include <linux/dev_printk.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 2ff591b3458f..b380cebcc862 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 2823ddde4bf2..c28f8930ade6 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -8,7 +8,6 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/string.h>
diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c
index 1fa88b99149e..7d5338457b3e 100644
--- a/drivers/iio/accel/kxsd9-i2c.c
+++ b/drivers/iio/accel/kxsd9-i2c.c
@@ -2,7 +2,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c
index cbb6c6412665..31a26baba9f7 100644
--- a/drivers/iio/accel/kxsd9-spi.c
+++ b/drivers/iio/accel/kxsd9-spi.c
@@ -3,7 +3,6 @@
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c
index be3213600cf4..c705d86fac24 100644
--- a/drivers/iio/accel/mma7660.c
+++ b/drivers/iio/accel/mma7660.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 15172ba2972c..d602d71f3cad 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -19,7 +19,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
index 02195deada49..070bbb18d353 100644
--- a/drivers/iio/accel/mma9551.c
+++ b/drivers/iio/accel/mma9551.c
@@ -6,7 +6,6 @@
 
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index f85384a7908f..f2f9c812efb0 100644
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -6,7 +6,6 @@
 
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/accel/msa311.c b/drivers/iio/accel/msa311.c
index 5eace0de3750..e0e73b87cba8 100644
--- a/drivers/iio/accel/msa311.c
+++ b/drivers/iio/accel/msa311.c
@@ -28,7 +28,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index a2c3cf13d098..25f77ed65c5d 100644
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/accel/mxc6255.c b/drivers/iio/accel/mxc6255.c
index fc3ed84d1933..02de8200561a 100644
--- a/drivers/iio/accel/mxc6255.c
+++ b/drivers/iio/accel/mxc6255.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/iio/iio.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/iio/sysfs.h>
 
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index f24449500533..f50c18efd062 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index d8ec0555f42a..e6bf8d0d4ff5 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c
index a9ff2a273fe1..e7469bdfe4e5 100644
--- a/drivers/iio/accel/stk8ba50.c
+++ b/drivers/iio/accel/stk8ba50.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/adc/88pm886-gpadc.c b/drivers/iio/adc/88pm886-gpadc.c
index cffe35136685..ebf2b5877a19 100644
--- a/drivers/iio/adc/88pm886-gpadc.c
+++ b/drivers/iio/adc/88pm886-gpadc.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/adc/ad4000.c b/drivers/iio/adc/ad4000.c
index fd3d79fca785..c2f6f5f9812c 100644
--- a/drivers/iio/adc/ad4000.c
+++ b/drivers/iio/adc/ad4000.c
@@ -12,7 +12,6 @@
 #include <linux/err.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/offload/consumer.h>
diff --git a/drivers/iio/adc/ad4080.c b/drivers/iio/adc/ad4080.c
index 204ad198342b..3926f53892f9 100644
--- a/drivers/iio/adc/ad4080.c
+++ b/drivers/iio/adc/ad4080.c
@@ -13,7 +13,6 @@
 #include <linux/err.h>
 #include <linux/iio/backend.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/ad4134.c b/drivers/iio/adc/ad4134.c
index e42ee328fcbf..cb9d74316f6a 100644
--- a/drivers/iio/adc/ad4134.c
+++ b/drivers/iio/adc/ad4134.c
@@ -17,7 +17,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/types.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
diff --git a/drivers/iio/adc/ad4851.c b/drivers/iio/adc/ad4851.c
index 1ad77f2a4580..940b042d743a 100644
--- a/drivers/iio/adc/ad4851.c
+++ b/drivers/iio/adc/ad4851.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pwm.h>
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index 5c1a8f886bcc..19058d081418 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -19,7 +19,6 @@
 #include <linux/kfifo.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/ad7173.c b/drivers/iio/adc/ad7173.c
index f76a9e08f39e..9ee65d63c525 100644
--- a/drivers/iio/adc/ad7173.c
+++ b/drivers/iio/adc/ad7173.c
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ad7191.c b/drivers/iio/adc/ad7191.c
index d9cd903ffdd2..e9238196380a 100644
--- a/drivers/iio/adc/ad7191.c
+++ b/drivers/iio/adc/ad7191.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
index 8b1664f6b102..ed425b20bee8 100644
--- a/drivers/iio/adc/ad7192.c
+++ b/drivers/iio/adc/ad7192.c
@@ -20,7 +20,6 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/units.h>
 
diff --git a/drivers/iio/adc/ad7280a.c b/drivers/iio/adc/ad7280a.c
index ba12a3796e2b..9db487882497 100644
--- a/drivers/iio/adc/ad7280a.c
+++ b/drivers/iio/adc/ad7280a.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
diff --git a/drivers/iio/adc/ad7292.c b/drivers/iio/adc/ad7292.c
index a398973f313d..710107339bad 100644
--- a/drivers/iio/adc/ad7292.c
+++ b/drivers/iio/adc/ad7292.c
@@ -8,7 +8,6 @@
 #include <linux/bitfield.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index 7c0538ea15c8..5fa76aec360e 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -13,7 +13,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
diff --git a/drivers/iio/adc/ad7405.c b/drivers/iio/adc/ad7405.c
index 9adf85a732ce..0996f48d76f1 100644
--- a/drivers/iio/adc/ad7405.c
+++ b/drivers/iio/adc/ad7405.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ad7606_par.c b/drivers/iio/adc/ad7606_par.c
index b81e707ab40c..5b137e947f0b 100644
--- a/drivers/iio/adc/ad7606_par.c
+++ b/drivers/iio/adc/ad7606_par.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/ad7625.c b/drivers/iio/adc/ad7625.c
index 0466c0c7eae4..b02589f6e6df 100644
--- a/drivers/iio/adc/ad7625.c
+++ b/drivers/iio/adc/ad7625.c
@@ -17,7 +17,6 @@
 #include <linux/iio/backend.h>
 #include <linux/iio/iio.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/iio/adc/ad7779.c b/drivers/iio/adc/ad7779.c
index 695cc79e78da..003e23d6e242 100644
--- a/drivers/iio/adc/ad7779.c
+++ b/drivers/iio/adc/ad7779.c
@@ -16,7 +16,6 @@
 #include <linux/irq.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/string.h>
diff --git a/drivers/iio/adc/adi-axi-adc.c b/drivers/iio/adc/adi-axi-adc.c
index ced0a2321ecf..26b9c75bd4d8 100644
--- a/drivers/iio/adc/adi-axi-adc.c
+++ b/drivers/iio/adc/adi-axi-adc.c
@@ -13,7 +13,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index 255970b2e747..e8a5285bb6d4 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/sched.h>
diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c
index f9a60e8b05cb..d9016fe1aca9 100644
--- a/drivers/iio/adc/axp20x_adc.c
+++ b/drivers/iio/adc/axp20x_adc.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c
index 6426c9e6ccc9..cf4738b16e62 100644
--- a/drivers/iio/adc/bcm_iproc_adc.c
+++ b/drivers/iio/adc/bcm_iproc_adc.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/mfd/syscon.h>
diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c
index fa04e0a5f645..a67edf0bddaa 100644
--- a/drivers/iio/adc/berlin2-adc.c
+++ b/drivers/iio/adc/berlin2-adc.c
@@ -15,7 +15,6 @@
 #include <linux/iio/machine.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c
index f6f72efcc6ed..223e2737c564 100644
--- a/drivers/iio/adc/cpcap-adc.c
+++ b/drivers/iio/adc/cpcap-adc.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
index 5b16fe737659..30672e584c10 100644
--- a/drivers/iio/adc/envelope-detector.c
+++ b/drivers/iio/adc/envelope-detector.c
@@ -31,7 +31,6 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/iio/consumer.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c
index e6268f7ac400..dc310ed616a1 100644
--- a/drivers/iio/adc/fsl-imx25-gcq.c
+++ b/drivers/iio/adc/fsl-imx25-gcq.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/imx25-tsadc.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
index 86c10ea7ded4..b01ba86c2945 100644
--- a/drivers/iio/adc/hi8435.c
+++ b/drivers/iio/adc/hi8435.c
@@ -15,7 +15,6 @@
 #include <linux/iio/triggered_event.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio/consumer.h>
 
diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c
index 1db8b68a8f64..54b935a11a49 100644
--- a/drivers/iio/adc/hx711.c
+++ b/drivers/iio/adc/hx711.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c
index 039c0387da23..e9a509dc11b8 100644
--- a/drivers/iio/adc/imx7d_adc.c
+++ b/drivers/iio/adc/imx7d_adc.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/imx8qxp-adc.c b/drivers/iio/adc/imx8qxp-adc.c
index 6fc50394ad90..d7cc9774359e 100644
--- a/drivers/iio/adc/imx8qxp-adc.c
+++ b/drivers/iio/adc/imx8qxp-adc.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/adc/imx93_adc.c b/drivers/iio/adc/imx93_adc.c
index 787e80db5de3..797adaf371ba 100644
--- a/drivers/iio/adc/imx93_adc.c
+++ b/drivers/iio/adc/imx93_adc.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c
index 1e802c8779a4..6dbeb8dfe53f 100644
--- a/drivers/iio/adc/ingenic-adc.c
+++ b/drivers/iio/adc/ingenic-adc.c
@@ -15,7 +15,6 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/intel_dc_ti_adc.c b/drivers/iio/adc/intel_dc_ti_adc.c
index b5afad713e2d..698a2a3049e3 100644
--- a/drivers/iio/adc/intel_dc_ti_adc.c
+++ b/drivers/iio/adc/intel_dc_ti_adc.c
@@ -14,7 +14,6 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/intel_soc_pmic.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/intel_mrfld_adc.c b/drivers/iio/adc/intel_mrfld_adc.c
index 101c1a0ce591..ff34e597944b 100644
--- a/drivers/iio/adc/intel_mrfld_adc.c
+++ b/drivers/iio/adc/intel_mrfld_adc.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/intel_soc_pmic.h>
 #include <linux/mfd/intel_soc_pmic_mrfld.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/lpc18xx_adc.c b/drivers/iio/adc/lpc18xx_adc.c
index 7e5d181ff702..2cf2519f55f3 100644
--- a/drivers/iio/adc/lpc18xx_adc.c
+++ b/drivers/iio/adc/lpc18xx_adc.c
@@ -17,7 +17,6 @@
 #include <linux/iio/driver.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c
index 43a7bc8158b5..0128d003f960 100644
--- a/drivers/iio/adc/lpc32xx_adc.c
+++ b/drivers/iio/adc/lpc32xx_adc.c
@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ltc2496.c b/drivers/iio/adc/ltc2496.c
index f06dd0b9a858..5b5b6ab28850 100644
--- a/drivers/iio/adc/ltc2496.c
+++ b/drivers/iio/adc/ltc2496.c
@@ -14,7 +14,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/driver.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #include "ltc2497.h"
diff --git a/drivers/iio/adc/ltc2497.c b/drivers/iio/adc/ltc2497.c
index eb9d521e86e5..4ae67b3cacef 100644
--- a/drivers/iio/adc/ltc2497.c
+++ b/drivers/iio/adc/ltc2497.c
@@ -11,7 +11,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/driver.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #include <linux/unaligned.h>
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index 7e736e77d8bb..8b2c7b2a9c8f 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -14,7 +14,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/delay.h>
 
diff --git a/drivers/iio/adc/max11100.c b/drivers/iio/adc/max11100.c
index 520e37f75aac..549dea6bf95c 100644
--- a/drivers/iio/adc/max11100.c
+++ b/drivers/iio/adc/max11100.c
@@ -8,7 +8,6 @@
  */
 #include <linux/delay.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/max1118.c b/drivers/iio/adc/max1118.c
index 7d7001e8e3d9..d394e03cc4e8 100644
--- a/drivers/iio/adc/max1118.c
+++ b/drivers/iio/adc/max1118.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 4d0b79cfeb27..65a2d92bb112 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -23,7 +23,6 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/unaligned.h>
 
diff --git a/drivers/iio/adc/max14001.c b/drivers/iio/adc/max14001.c
index 90ad4cb5868d..09017163b191 100644
--- a/drivers/iio/adc/max14001.c
+++ b/drivers/iio/adc/max14001.c
@@ -15,7 +15,6 @@
 #include <linux/bits.h>
 #include <linux/cleanup.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/max34408.c b/drivers/iio/adc/max34408.c
index 4f45fd22a90c..26ccb7b59891 100644
--- a/drivers/iio/adc/max34408.c
+++ b/drivers/iio/adc/max34408.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/adc/max77541-adc.c b/drivers/iio/adc/max77541-adc.c
index 0aa04d143ad4..3022bd100001 100644
--- a/drivers/iio/adc/max77541-adc.c
+++ b/drivers/iio/adc/max77541-adc.c
@@ -6,7 +6,6 @@
 
 #include <linux/bitfield.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/units.h>
diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
index 826566d7a85e..45cea84c5d4a 100644
--- a/drivers/iio/adc/max9611.c
+++ b/drivers/iio/adc/max9611.c
@@ -22,7 +22,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 /* max9611 register addresses */
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index 57cff3772ebe..686c519aa3d2 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -41,7 +41,6 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/iio/iio.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index 50834fdcf738..173a040a6f42 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -16,7 +16,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/sysfs.h>
 #include <linux/unaligned.h>
diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
index ddc3721f3f68..5bf74b49bdb5 100644
--- a/drivers/iio/adc/mcp3911.c
+++ b/drivers/iio/adc/mcp3911.c
@@ -14,7 +14,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/mp2629_adc.c b/drivers/iio/adc/mp2629_adc.c
index 5a1d516f8dad..c03f89ddbd13 100644
--- a/drivers/iio/adc/mp2629_adc.c
+++ b/drivers/iio/adc/mp2629_adc.c
@@ -11,7 +11,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/machine.h>
 #include <linux/mfd/mp2629.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/mt6359-auxadc.c b/drivers/iio/adc/mt6359-auxadc.c
index 1d9724ef0983..88b0e26309e5 100644
--- a/drivers/iio/adc/mt6359-auxadc.c
+++ b/drivers/iio/adc/mt6359-auxadc.c
@@ -12,7 +12,6 @@
 #include <linux/cleanup.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/mt6360-adc.c b/drivers/iio/adc/mt6360-adc.c
index e0e4df418612..e59b13e88aa2 100644
--- a/drivers/iio/adc/mt6360-adc.c
+++ b/drivers/iio/adc/mt6360-adc.c
@@ -5,7 +5,6 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/ktime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/mt6370-adc.c b/drivers/iio/adc/mt6370-adc.c
index 7c71fe5e8d31..c250385f9d34 100644
--- a/drivers/iio/adc/mt6370-adc.c
+++ b/drivers/iio/adc/mt6370-adc.c
@@ -9,7 +9,6 @@
 #include <linux/bitfield.h>
 #include <linux/iio/iio.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c
index fe9e3ece3fda..ecbae90ac2ed 100644
--- a/drivers/iio/adc/mt6577_auxadc.c
+++ b/drivers/iio/adc/mt6577_auxadc.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/iopoll.h>
diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
index 970afb27b839..f8609a1176ce 100644
--- a/drivers/iio/adc/nau7802.c
+++ b/drivers/iio/adc/nau7802.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/wait.h>
diff --git a/drivers/iio/adc/nct7201.c b/drivers/iio/adc/nct7201.c
index d87824e5490f..bea88a9b9440 100644
--- a/drivers/iio/adc/nct7201.c
+++ b/drivers/iio/adc/nct7201.c
@@ -12,7 +12,6 @@
 #include <linux/dev_printk.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/time.h>
diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c
index 61c8b825bda1..a25c15b38759 100644
--- a/drivers/iio/adc/npcm_adc.c
+++ b/drivers/iio/adc/npcm_adc.c
@@ -8,7 +8,6 @@
 #include <linux/iio/iio.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/nxp-sar-adc.c b/drivers/iio/adc/nxp-sar-adc.c
index 8f4ed3db94f0..408e6cbf173d 100644
--- a/drivers/iio/adc/nxp-sar-adc.c
+++ b/drivers/iio/adc/nxp-sar-adc.c
@@ -21,7 +21,6 @@
 #include <linux/iopoll.h>
 #include <linux/math64.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
index 31f88cf7f7f1..6acf0e303f96 100644
--- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c
+++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
@@ -14,7 +14,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/qcom-spmi-adc5-gen3.c b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
index 48c793b18d11..c56b650fd8c0 100644
--- a/drivers/iio/adc/qcom-spmi-adc5-gen3.c
+++ b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
index af3c2f659f5e..83ecd3adf65f 100644
--- a/drivers/iio/adc/qcom-spmi-adc5.c
+++ b/drivers/iio/adc/qcom-spmi-adc5.c
@@ -14,7 +14,6 @@
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/qcom-spmi-rradc.c b/drivers/iio/adc/qcom-spmi-rradc.c
index 8e75665204d1..1682c6faf62c 100644
--- a/drivers/iio/adc/qcom-spmi-rradc.c
+++ b/drivers/iio/adc/qcom-spmi-rradc.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 00a7f0982025..d7a2df3c810e 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/adc/rohm-bd79112.c b/drivers/iio/adc/rohm-bd79112.c
index 7420aa6627d5..c4b0bec80794 100644
--- a/drivers/iio/adc/rohm-bd79112.c
+++ b/drivers/iio/adc/rohm-bd79112.c
@@ -14,7 +14,6 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/gpio/driver.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/rohm-bd79124.c b/drivers/iio/adc/rohm-bd79124.c
index 40d00bd0cc9d..fdcad4372310 100644
--- a/drivers/iio/adc/rohm-bd79124.c
+++ b/drivers/iio/adc/rohm-bd79124.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/irqreturn.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
 
diff --git a/drivers/iio/adc/rtq6056.c b/drivers/iio/adc/rtq6056.c
index 2bf3a09ac6b0..dc3f167576a3 100644
--- a/drivers/iio/adc/rtq6056.c
+++ b/drivers/iio/adc/rtq6056.c
@@ -9,7 +9,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/rzg2l_adc.c b/drivers/iio/adc/rzg2l_adc.c
index 1010e0511b3e..408fbf8c29cc 100644
--- a/drivers/iio/adc/rzg2l_adc.c
+++ b/drivers/iio/adc/rzg2l_adc.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/adc/rzn1-adc.c b/drivers/iio/adc/rzn1-adc.c
index 93b0feef8ea0..f921cd49b789 100644
--- a/drivers/iio/adc/rzn1-adc.c
+++ b/drivers/iio/adc/rzn1-adc.c
@@ -21,7 +21,6 @@
 #include <linux/iio/iio.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/rzt2h_adc.c b/drivers/iio/adc/rzt2h_adc.c
index 33ce5cc44ff4..4e0eb02d3d14 100644
--- a/drivers/iio/adc/rzt2h_adc.c
+++ b/drivers/iio/adc/rzt2h_adc.c
@@ -9,7 +9,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/adc/sd_adc_modulator.c b/drivers/iio/adc/sd_adc_modulator.c
index 218117c45ec8..def44d8831dc 100644
--- a/drivers/iio/adc/sd_adc_modulator.c
+++ b/drivers/iio/adc/sd_adc_modulator.c
@@ -10,7 +10,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/sophgo-cv1800b-adc.c b/drivers/iio/adc/sophgo-cv1800b-adc.c
index 0951deb7b111..bdc3e1326a9a 100644
--- a/drivers/iio/adc/sophgo-cv1800b-adc.c
+++ b/drivers/iio/adc/sophgo-cv1800b-adc.c
@@ -15,7 +15,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
index 91995489bb1c..1614dd0c8f66 100644
--- a/drivers/iio/adc/spear_adc.c
+++ b/drivers/iio/adc/spear_adc.c
@@ -5,7 +5,6 @@
  * Copyright 2012 Stefan Roese <sr@denx.de>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 46106200bb86..cae2c4a7bf19 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/adc/sun20i-gpadc-iio.c b/drivers/iio/adc/sun20i-gpadc-iio.c
index 861c14da75ad..39523ed20ed4 100644
--- a/drivers/iio/adc/sun20i-gpadc-iio.c
+++ b/drivers/iio/adc/sun20i-gpadc-iio.c
@@ -9,7 +9,6 @@
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/ti-adc081c.c b/drivers/iio/adc/ti-adc081c.c
index 8ef51c57912d..301a2b1eb826 100644
--- a/drivers/iio/adc/ti-adc081c.c
+++ b/drivers/iio/adc/ti-adc081c.c
@@ -18,7 +18,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/adc/ti-adc0832.c b/drivers/iio/adc/ti-adc0832.c
index cfcdafbe284b..63d712d5d111 100644
--- a/drivers/iio/adc/ti-adc0832.c
+++ b/drivers/iio/adc/ti-adc0832.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c
index a100f770fa1c..51596b500a90 100644
--- a/drivers/iio/adc/ti-adc084s021.c
+++ b/drivers/iio/adc/ti-adc084s021.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/spi/spi.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/adc/ti-adc108s102.c b/drivers/iio/adc/ti-adc108s102.c
index 7d615e2bbf39..d1f61b440959 100644
--- a/drivers/iio/adc/ti-adc108s102.c
+++ b/drivers/iio/adc/ti-adc108s102.c
@@ -20,7 +20,6 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index 4ae65793ad9b..2cb68582ee6a 100644
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -12,7 +12,6 @@
 #include <linux/cleanup.h>
 #include <linux/err.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ti-adc161s626.c b/drivers/iio/adc/ti-adc161s626.c
index be1cc2e77862..08aa32bd5e4b 100644
--- a/drivers/iio/adc/ti-adc161s626.c
+++ b/drivers/iio/adc/ti-adc161s626.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/ti-ads1018.c b/drivers/iio/adc/ti-ads1018.c
index 0780abd0d0db..d6624c71a374 100644
--- a/drivers/iio/adc/ti-ads1018.c
+++ b/drivers/iio/adc/ti-ads1018.c
@@ -12,7 +12,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/types.h>
diff --git a/drivers/iio/adc/ti-ads124s08.c b/drivers/iio/adc/ti-ads124s08.c
index 8ea1269f74db..522b43118af6 100644
--- a/drivers/iio/adc/ti-ads124s08.c
+++ b/drivers/iio/adc/ti-ads124s08.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 
diff --git a/drivers/iio/adc/ti-ads131m02.c b/drivers/iio/adc/ti-ads131m02.c
index 07d63bf62c5f..36203ce37c89 100644
--- a/drivers/iio/adc/ti-ads131m02.c
+++ b/drivers/iio/adc/ti-ads131m02.c
@@ -23,7 +23,6 @@
 #include <linux/err.h>
 #include <linux/iio/iio.h>
 #include <linux/lockdep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c
index b0bf46cae0b6..9d3711342236 100644
--- a/drivers/iio/adc/ti-ads8688.c
+++ b/drivers/iio/adc/ti-ads8688.c
@@ -11,7 +11,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c
index f67945c62c99..94bbf5afe30e 100644
--- a/drivers/iio/adc/ti-tlc4541.c
+++ b/drivers/iio/adc/ti-tlc4541.c
@@ -24,7 +24,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index f0274cd74973..0ee7e16b5e24 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index 7810d6b2b668..31b1c01baa27 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -16,7 +16,6 @@
  */
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index d7182ed0d2a7..bcbeb482e714 100644
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -5,7 +5,6 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c
index 124470c92529..3db865acc10e 100644
--- a/drivers/iio/adc/xilinx-ams.c
+++ b/drivers/iio/adc/xilinx-ams.c
@@ -18,7 +18,6 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/overflow.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 3980dfacbcd7..cab66bb8cc1c 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/overflow.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/addac/ad74413r.c b/drivers/iio/addac/ad74413r.c
index fe930ce5ee30..43bd2079cf6d 100644
--- a/drivers/iio/addac/ad74413r.c
+++ b/drivers/iio/addac/ad74413r.c
@@ -18,7 +18,6 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
index ecaf59278c6f..654a3a50eb4f 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -10,7 +10,6 @@
 
 #include <linux/err.h>
 #include <linux/gcd.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c
index bbf41a1fb3a1..affc9c9d8488 100644
--- a/drivers/iio/amplifiers/ad8366.c
+++ b/drivers/iio/amplifiers/ad8366.c
@@ -26,7 +26,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/math.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/amplifiers/adl8113.c b/drivers/iio/amplifiers/adl8113.c
index b8a431b6616b..1f1cfca980b4 100644
--- a/drivers/iio/amplifiers/adl8113.c
+++ b/drivers/iio/amplifiers/adl8113.c
@@ -12,7 +12,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/amplifiers/hmc425a.c b/drivers/iio/amplifiers/hmc425a.c
index 4dbf894c7e3b..85bfc8dcc5fb 100644
--- a/drivers/iio/amplifiers/hmc425a.c
+++ b/drivers/iio/amplifiers/hmc425a.c
@@ -14,7 +14,6 @@
 #include <linux/iio/sysfs.h>
 #include <linux/kernel.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/cdc/ad7150.c b/drivers/iio/cdc/ad7150.c
index 8106a6a83561..601e46ae685c 100644
--- a/drivers/iio/cdc/ad7150.c
+++ b/drivers/iio/cdc/ad7150.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
diff --git a/drivers/iio/chemical/ams-iaq-core.c b/drivers/iio/chemical/ams-iaq-core.c
index 10156d794092..48dce6d73a5d 100644
--- a/drivers/iio/chemical/ams-iaq-core.c
+++ b/drivers/iio/chemical/ams-iaq-core.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
diff --git a/drivers/iio/chemical/atlas-ezo-sensor.c b/drivers/iio/chemical/atlas-ezo-sensor.c
index 59f3a4fa9e9f..639a73075030 100644
--- a/drivers/iio/chemical/atlas-ezo-sensor.c
+++ b/drivers/iio/chemical/atlas-ezo-sensor.c
@@ -8,7 +8,6 @@
 
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c
index 8bbba85af699..35e236782daa 100644
--- a/drivers/iio/chemical/atlas-sensor.c
+++ b/drivers/iio/chemical/atlas-sensor.c
@@ -15,7 +15,6 @@
 #include <linux/irq.h>
 #include <linux/irq_work.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/chemical/bme680_spi.c b/drivers/iio/chemical/bme680_spi.c
index aa97645ba539..785200a6fd65 100644
--- a/drivers/iio/chemical/bme680_spi.c
+++ b/drivers/iio/chemical/bme680_spi.c
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2018 Himanshu Jha <himanshujha199640@gmail.com>
  */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/chemical/mhz19b.c b/drivers/iio/chemical/mhz19b.c
index 9d4cf432919e..a793620e95b7 100644
--- a/drivers/iio/chemical/mhz19b.c
+++ b/drivers/iio/chemical/mhz19b.c
@@ -17,7 +17,6 @@
 #include <linux/jiffies.h>
 #include <linux/kstrtox.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 #include <linux/serdev.h>
diff --git a/drivers/iio/chemical/pms7003.c b/drivers/iio/chemical/pms7003.c
index 656d4a12c58f..c50edb24af89 100644
--- a/drivers/iio/chemical/pms7003.c
+++ b/drivers/iio/chemical/pms7003.c
@@ -14,7 +14,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/serdev.h>
diff --git a/drivers/iio/chemical/scd30_i2c.c b/drivers/iio/chemical/scd30_i2c.c
index 436df9c61a71..01926fd20302 100644
--- a/drivers/iio/chemical/scd30_i2c.c
+++ b/drivers/iio/chemical/scd30_i2c.c
@@ -10,7 +10,6 @@
 #include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/unaligned.h>
diff --git a/drivers/iio/chemical/scd30_serial.c b/drivers/iio/chemical/scd30_serial.c
index e8b453aae859..7fefdadbfa0a 100644
--- a/drivers/iio/chemical/scd30_serial.c
+++ b/drivers/iio/chemical/scd30_serial.c
@@ -9,7 +9,6 @@
 #include <linux/errno.h>
 #include <linux/iio/iio.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/serdev.h>
diff --git a/drivers/iio/chemical/sgp30.c b/drivers/iio/chemical/sgp30.c
index 21730d62b5c8..49517e734900 100644
--- a/drivers/iio/chemical/sgp30.c
+++ b/drivers/iio/chemical/sgp30.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/chemical/sps30_i2c.c b/drivers/iio/chemical/sps30_i2c.c
index c92f04990c34..8831e06ee32a 100644
--- a/drivers/iio/chemical/sps30_i2c.c
+++ b/drivers/iio/chemical/sps30_i2c.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 
diff --git a/drivers/iio/chemical/sps30_serial.c b/drivers/iio/chemical/sps30_serial.c
index a5e6bc08d5fd..80eab9b2e4bf 100644
--- a/drivers/iio/chemical/sps30_serial.c
+++ b/drivers/iio/chemical/sps30_serial.c
@@ -9,7 +9,6 @@
 #include <linux/errno.h>
 #include <linux/iio/iio.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/serdev.h>
 #include <linux/types.h>
diff --git a/drivers/iio/chemical/sunrise_co2.c b/drivers/iio/chemical/sunrise_co2.c
index 158be9d798d2..dae8a7025e05 100644
--- a/drivers/iio/chemical/sunrise_co2.c
+++ b/drivers/iio/chemical/sunrise_co2.c
@@ -13,7 +13,6 @@
 #include <linux/bitops.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/chemical/vz89x.c b/drivers/iio/chemical/vz89x.c
index 5b358bcd311b..9ed13bfc9e8f 100644
--- a/drivers/iio/chemical/vz89x.c
+++ b/drivers/iio/chemical/vz89x.c
@@ -10,7 +10,6 @@
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c b/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c
index 2d3d148b4206..8f5bf40a0596 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c
@@ -20,7 +20,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
index f34e2bbba2d1..c915fa766f87 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -16,7 +16,6 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/iio/common/ssp_sensors/ssp_dev.c b/drivers/iio/common/ssp_sensors/ssp_dev.c
index e2538a84c812..75895100de8c 100644
--- a/drivers/iio/common/ssp_sensors/ssp_dev.c
+++ b/drivers/iio/common/ssp_sensors/ssp_dev.c
@@ -7,7 +7,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 
diff --git a/drivers/iio/dac/ad3530r.c b/drivers/iio/dac/ad3530r.c
index d9db3226ecd6..4e911bfb6fc5 100644
--- a/drivers/iio/dac/ad3530r.c
+++ b/drivers/iio/dac/ad3530r.c
@@ -16,7 +16,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/iio/iio.h>
 #include <linux/kstrtox.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/iio/dac/ad3552r-hs.c b/drivers/iio/dac/ad3552r-hs.c
index a9578afa7015..a7b7fdf6b5e5 100644
--- a/drivers/iio/dac/ad3552r-hs.c
+++ b/drivers/iio/dac/ad3552r-hs.c
@@ -12,7 +12,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/iio/backend.h>
 #include <linux/iio/buffer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/units.h>
diff --git a/drivers/iio/dac/ad5446-i2c.c b/drivers/iio/dac/ad5446-i2c.c
index 40fe7e17fce4..19486f598678 100644
--- a/drivers/iio/dac/ad5446-i2c.c
+++ b/drivers/iio/dac/ad5446-i2c.c
@@ -6,7 +6,6 @@
  */
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 
 #include <asm/byteorder.h>
diff --git a/drivers/iio/dac/ad5446-spi.c b/drivers/iio/dac/ad5446-spi.c
index e29d77f21482..54bd0e113f40 100644
--- a/drivers/iio/dac/ad5446-spi.c
+++ b/drivers/iio/dac/ad5446-spi.c
@@ -6,7 +6,6 @@
  */
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/unaligned.h>
 
diff --git a/drivers/iio/dac/ad5592r.c b/drivers/iio/dac/ad5592r.c
index 92d1b629b85d..88197bc6a70b 100644
--- a/drivers/iio/dac/ad5592r.c
+++ b/drivers/iio/dac/ad5592r.c
@@ -10,7 +10,6 @@
 
 #include <linux/bitops.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 #define AD5592R_GPIO_READBACK_EN	BIT(10)
diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c
index 9a8525c61173..3e4215f0ca7e 100644
--- a/drivers/iio/dac/ad5593r.c
+++ b/drivers/iio/dac/ad5593r.c
@@ -11,7 +11,6 @@
 #include <linux/bitops.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/unaligned.h>
 
diff --git a/drivers/iio/dac/ad5758.c b/drivers/iio/dac/ad5758.c
index 4ed4fda76ea9..b1a6527a719d 100644
--- a/drivers/iio/dac/ad5758.c
+++ b/drivers/iio/dac/ad5758.c
@@ -10,7 +10,6 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/iio/dac/ad7293.c b/drivers/iio/dac/ad7293.c
index df6f126abf05..03acf7c114b0 100644
--- a/drivers/iio/dac/ad7293.c
+++ b/drivers/iio/dac/ad7293.c
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/dac/ad7303.c b/drivers/iio/dac/ad7303.c
index a88cc639047d..d8326e9f548a 100644
--- a/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@ -7,7 +7,6 @@
 
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
diff --git a/drivers/iio/dac/ad8460.c b/drivers/iio/dac/ad8460.c
index 6e45686902dd..ddec62b6e57b 100644
--- a/drivers/iio/dac/ad8460.c
+++ b/drivers/iio/dac/ad8460.c
@@ -14,7 +14,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/dac/ad9739a.c b/drivers/iio/dac/ad9739a.c
index d77b46d83bd4..ccd6a3b1e891 100644
--- a/drivers/iio/dac/ad9739a.c
+++ b/drivers/iio/dac/ad9739a.c
@@ -14,7 +14,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/dac/adi-axi-dac.c b/drivers/iio/dac/adi-axi-dac.c
index 451fad34e7ee..f4f3bc67c68e 100644
--- a/drivers/iio/dac/adi-axi-dac.c
+++ b/drivers/iio/dac/adi-axi-dac.c
@@ -17,7 +17,6 @@
 #include <linux/math.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c
index d1b8441051ae..cf6d94e7af84 100644
--- a/drivers/iio/dac/dpot-dac.c
+++ b/drivers/iio/dac/dpot-dac.c
@@ -30,7 +30,6 @@
 #include <linux/iio/consumer.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/iio/dac/lpc18xx_dac.c b/drivers/iio/dac/lpc18xx_dac.c
index aa1c73f8429d..43fb9e5a2c56 100644
--- a/drivers/iio/dac/lpc18xx_dac.c
+++ b/drivers/iio/dac/lpc18xx_dac.c
@@ -16,7 +16,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/dac/ltc2664.c b/drivers/iio/dac/ltc2664.c
index 67f14046cf77..b3da40342b45 100644
--- a/drivers/iio/dac/ltc2664.c
+++ b/drivers/iio/dac/ltc2664.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/dac/ltc2688.c b/drivers/iio/dac/ltc2688.c
index 02f408229681..a575ef8371dc 100644
--- a/drivers/iio/dac/ltc2688.c
+++ b/drivers/iio/dac/ltc2688.c
@@ -14,7 +14,6 @@
 #include <linux/limits.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/property.h>
diff --git a/drivers/iio/dac/max22007.c b/drivers/iio/dac/max22007.c
index 182ac7155a89..d747901df5a3 100644
--- a/drivers/iio/dac/max22007.c
+++ b/drivers/iio/dac/max22007.c
@@ -19,7 +19,6 @@
 #include <linux/iio/iio.h>
 #include <linux/kstrtox.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/dac/max5522.c b/drivers/iio/dac/max5522.c
index b52a9cc1da79..1459ba132df6 100644
--- a/drivers/iio/dac/max5522.c
+++ b/drivers/iio/dac/max5522.c
@@ -9,7 +9,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index 23b9e3a09ec8..455531f1a9c9 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -16,7 +16,6 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/dac/mcp4728.c b/drivers/iio/dac/mcp4728.c
index 4f30b99110b7..c9d1462e0ebd 100644
--- a/drivers/iio/dac/mcp4728.c
+++ b/drivers/iio/dac/mcp4728.c
@@ -20,7 +20,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/iio/dac/mcp47feb02.c b/drivers/iio/dac/mcp47feb02.c
index faccb804a5ed..f7a485af953f 100644
--- a/drivers/iio/dac/mcp47feb02.c
+++ b/drivers/iio/dac/mcp47feb02.c
@@ -21,7 +21,6 @@
 #include <linux/iio/sysfs.h>
 #include <linux/kstrtox.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/dac/mcp4821.c b/drivers/iio/dac/mcp4821.c
index 748bdca9a964..c3208732f363 100644
--- a/drivers/iio/dac/mcp4821.c
+++ b/drivers/iio/dac/mcp4821.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/dac/stm32-dac-core.c b/drivers/iio/dac/stm32-dac-core.c
index 8ef702917060..b5795c14f0fe 100644
--- a/drivers/iio/dac/stm32-dac-core.c
+++ b/drivers/iio/dac/stm32-dac-core.c
@@ -9,7 +9,6 @@
 
 #include <linux/clk.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/dac/stm32-dac.c b/drivers/iio/dac/stm32-dac.c
index b860e18d52a1..99438f6d4700 100644
--- a/drivers/iio/dac/stm32-dac.c
+++ b/drivers/iio/dac/stm32-dac.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/kstrtox.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/dac/ti-dac082s085.c b/drivers/iio/dac/ti-dac082s085.c
index 715870c8a9c4..6e62c1f302c8 100644
--- a/drivers/iio/dac/ti-dac082s085.c
+++ b/drivers/iio/dac/ti-dac082s085.c
@@ -14,7 +14,6 @@
 
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/iio/dac/ti-dac5571.c b/drivers/iio/dac/ti-dac5571.c
index 455d61fc3f13..fb469c12a8b6 100644
--- a/drivers/iio/dac/ti-dac5571.c
+++ b/drivers/iio/dac/ti-dac5571.c
@@ -20,7 +20,6 @@
 #include <linux/iio/iio.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 
diff --git a/drivers/iio/dac/vf610_dac.c b/drivers/iio/dac/vf610_dac.c
index 93639599b2b9..3aa22fecd308 100644
--- a/drivers/iio/dac/vf610_dac.c
+++ b/drivers/iio/dac/vf610_dac.c
@@ -10,7 +10,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/filter/admv8818.c b/drivers/iio/filter/admv8818.c
index a4984b867248..8bcd298e1f3d 100644
--- a/drivers/iio/filter/admv8818.c
+++ b/drivers/iio/filter/admv8818.c
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
 #include <linux/property.h>
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index 6bbb6a8dd9d0..639cac522b44 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -7,7 +7,6 @@
 
 #include <linux/device.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/iio/frequency/admfm2000.c b/drivers/iio/frequency/admfm2000.c
index b2263b9afeda..0405b53c5851 100644
--- a/drivers/iio/frequency/admfm2000.c
+++ b/drivers/iio/frequency/admfm2000.c
@@ -11,7 +11,6 @@
 #include <linux/iio/iio.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
diff --git a/drivers/iio/frequency/admv1013.c b/drivers/iio/frequency/admv1013.c
index b852378b3f68..b823adfb0f70 100644
--- a/drivers/iio/frequency/admv1013.c
+++ b/drivers/iio/frequency/admv1013.c
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/notifier.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/frequency/admv1014.c b/drivers/iio/frequency/admv1014.c
index 25e8cd8135ad..5d36ac4bb666 100644
--- a/drivers/iio/frequency/admv1014.c
+++ b/drivers/iio/frequency/admv1014.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/notifier.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/frequency/adrf6780.c b/drivers/iio/frequency/adrf6780.c
index 257fd31a0b0e..261901603dac 100644
--- a/drivers/iio/frequency/adrf6780.c
+++ b/drivers/iio/frequency/adrf6780.c
@@ -13,7 +13,6 @@
 #include <linux/device.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 #include <linux/unaligned.h>
diff --git a/drivers/iio/gyro/bmg160_i2c.c b/drivers/iio/gyro/bmg160_i2c.c
index 1fb8a7969c25..eb52eb74b1c5 100644
--- a/drivers/iio/gyro/bmg160_i2c.c
+++ b/drivers/iio/gyro/bmg160_i2c.c
@@ -3,7 +3,6 @@
 #include <linux/regmap.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include "bmg160.h"
 
diff --git a/drivers/iio/gyro/fxas21002c_i2c.c b/drivers/iio/gyro/fxas21002c_i2c.c
index 43c6b3079487..8ecb82aa0856 100644
--- a/drivers/iio/gyro/fxas21002c_i2c.c
+++ b/drivers/iio/gyro/fxas21002c_i2c.c
@@ -7,7 +7,6 @@
 
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/gyro/fxas21002c_spi.c b/drivers/iio/gyro/fxas21002c_spi.c
index d62efe50b697..bd5b8678da13 100644
--- a/drivers/iio/gyro/fxas21002c_spi.c
+++ b/drivers/iio/gyro/fxas21002c_spi.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index c340cc899a7c..d32849e9d2a8 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index aef5ec8f9dee..f2448e0b5065 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index f645da157372..adfbbc0d37dc 100644
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c
index 47da44efd68b..12e95a785359 100644
--- a/drivers/iio/health/max30102.c
+++ b/drivers/iio/health/max30102.c
@@ -19,7 +19,6 @@
 #include <linux/irq.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/humidity/dht11.c b/drivers/iio/humidity/dht11.c
index 980cb946bbf7..7690df97fd6c 100644
--- a/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@ -14,7 +14,6 @@
 #include <linux/string_choices.h>
 #include <linux/sysfs.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/wait.h>
diff --git a/drivers/iio/humidity/ens210.c b/drivers/iio/humidity/ens210.c
index 77418d97f30d..e427167d9dbc 100644
--- a/drivers/iio/humidity/ens210.c
+++ b/drivers/iio/humidity/ens210.c
@@ -18,7 +18,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index c2b36e682e06..813cfa569d29 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -16,7 +16,6 @@
 #include <linux/cleanup.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 
diff --git a/drivers/iio/humidity/hid-sensor-humidity.c b/drivers/iio/humidity/hid-sensor-humidity.c
index be2338d5f407..5267a14d73ec 100644
--- a/drivers/iio/humidity/hid-sensor-humidity.c
+++ b/drivers/iio/humidity/hid-sensor-humidity.c
@@ -8,7 +8,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "hid-sensor-trigger.h"
diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
index cbaa7d1af6c4..df095eebc737 100644
--- a/drivers/iio/humidity/hts221_i2c.c
+++ b/drivers/iio/humidity/hts221_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/humidity/htu21.c b/drivers/iio/humidity/htu21.c
index 7f1775bd26fd..665e734ccab6 100644
--- a/drivers/iio/humidity/htu21.c
+++ b/drivers/iio/humidity/htu21.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 
diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
index ff2dba50c0a5..6291957d0fb7 100644
--- a/drivers/iio/humidity/si7020.c
+++ b/drivers/iio/humidity/si7020.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/stat.h>
diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
index ab39bea1e729..17335386d8e3 100644
--- a/drivers/iio/imu/adis16475.c
+++ b/drivers/iio/imu/adis16475.c
@@ -20,7 +20,6 @@
 #include <linux/lcm.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index 543d5c4bfb11..e009f3824768 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -13,7 +13,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/lcm.h>
 #include <linux/property.h>
diff --git a/drivers/iio/imu/adis16550.c b/drivers/iio/imu/adis16550.c
index 75679612052f..1e435d60cd6d 100644
--- a/drivers/iio/imu/adis16550.c
+++ b/drivers/iio/imu/adis16550.c
@@ -18,7 +18,6 @@
 #include <linux/lcm.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/swab.h>
diff --git a/drivers/iio/imu/bmi160/bmi160_i2c.c b/drivers/iio/imu/bmi160/bmi160_i2c.c
index 3e2758f4e0d3..154100150393 100644
--- a/drivers/iio/imu/bmi160/bmi160_i2c.c
+++ b/drivers/iio/imu/bmi160/bmi160_i2c.c
@@ -9,7 +9,6 @@
  *      - 0x69 if SDO is pulled to VDDIO
  */
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/imu/bmi160/bmi160_spi.c b/drivers/iio/imu/bmi160/bmi160_spi.c
index 3581bd788483..2f0a578ee40f 100644
--- a/drivers/iio/imu/bmi160/bmi160_spi.c
+++ b/drivers/iio/imu/bmi160/bmi160_spi.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2016, Intel Corporation.
  *
  */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/imu/bmi270/bmi270_i2c.c b/drivers/iio/imu/bmi270/bmi270_i2c.c
index b92da4e0776f..3076ece362f2 100644
--- a/drivers/iio/imu/bmi270/bmi270_i2c.c
+++ b/drivers/iio/imu/bmi270/bmi270_i2c.c
@@ -3,7 +3,6 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/imu/bmi270/bmi270_spi.c b/drivers/iio/imu/bmi270/bmi270_spi.c
index 80c9fa1d685a..dc7fa01421bc 100644
--- a/drivers/iio/imu/bmi270/bmi270_spi.c
+++ b/drivers/iio/imu/bmi270/bmi270_spi.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/imu/bmi323/bmi323_i2c.c b/drivers/iio/imu/bmi323/bmi323_i2c.c
index 8457fe304db8..f4818525e65b 100644
--- a/drivers/iio/imu/bmi323/bmi323_i2c.c
+++ b/drivers/iio/imu/bmi323/bmi323_i2c.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/imu/bmi323/bmi323_spi.c b/drivers/iio/imu/bmi323/bmi323_spi.c
index fd56ab620750..92f1c4bcc192 100644
--- a/drivers/iio/imu/bmi323/bmi323_spi.c
+++ b/drivers/iio/imu/bmi323/bmi323_spi.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2023, Jagath Jog J <jagathjog1996@gmail.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/imu/bno055/bno055_i2c.c b/drivers/iio/imu/bno055/bno055_i2c.c
index f49d0905ee33..f026c2f36d5d 100644
--- a/drivers/iio/imu/bno055/bno055_i2c.c
+++ b/drivers/iio/imu/bno055/bno055_i2c.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/imu/bno055/bno055_ser_core.c b/drivers/iio/imu/bno055/bno055_ser_core.c
index 48669dabb37b..5774601b4dce 100644
--- a/drivers/iio/imu/bno055/bno055_ser_core.c
+++ b/drivers/iio/imu/bno055/bno055_ser_core.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/imu/fxos8700_i2c.c b/drivers/iio/imu/fxos8700_i2c.c
index 2cc4a27a4527..157eb317a8e5 100644
--- a/drivers/iio/imu/fxos8700_i2c.c
+++ b/drivers/iio/imu/fxos8700_i2c.c
@@ -12,7 +12,6 @@
  */
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 
 #include "fxos8700.h"
diff --git a/drivers/iio/imu/fxos8700_spi.c b/drivers/iio/imu/fxos8700_spi.c
index 6b0dc7a776b9..3edf90220bfa 100644
--- a/drivers/iio/imu/fxos8700_spi.c
+++ b/drivers/iio/imu/fxos8700_spi.c
@@ -3,7 +3,6 @@
  * FXOS8700 - NXP IMU, SPI bits
  */
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c
index 7e4d3ea68721..16edbc78ec9f 100644
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/property.h>
diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c
index 13e2e7d38638..57e3c448dca1 100644
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/regmap.h>
 #include <linux/property.h>
diff --git a/drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c b/drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c
index 5ebc18121a11..a1208aadcb90 100644
--- a/drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c
+++ b/drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c
@@ -5,7 +5,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 
 #include "inv_icm45600.h"
diff --git a/drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c b/drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c
index 9247eae9b3e2..8fb2e519bfc8 100644
--- a/drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c
+++ b/drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c
@@ -2,7 +2,6 @@
 /* Copyright (C) 2025 InvenSense, Inc. */
 
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c b/drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c
index 6288113a6d7c..450a0f2abaaa 100644
--- a/drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c
+++ b/drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c
@@ -5,7 +5,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 8dc61812a8fc..c679cead822e 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
index 1f4c62142b60..b8204eb0b4c6 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
@@ -2,7 +2,6 @@
 /*
 * Copyright (C) 2015 Intel Corporation Inc.
 */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 3cd91d8a89ee..4257075570a7 100644
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -9,7 +9,6 @@
 
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/imu/smi330/smi330_i2c.c b/drivers/iio/imu/smi330/smi330_i2c.c
index e5f1825beb71..eb9413e22e14 100644
--- a/drivers/iio/imu/smi330/smi330_i2c.c
+++ b/drivers/iio/imu/smi330/smi330_i2c.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2025 Robert Bosch GmbH.
  */
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/imu/smi330/smi330_spi.c b/drivers/iio/imu/smi330/smi330_spi.c
index a6044e02b451..78c2bfb15cce 100644
--- a/drivers/iio/imu/smi330/smi330_spi.c
+++ b/drivers/iio/imu/smi330/smi330_spi.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2025 Robert Bosch GmbH.
  */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c
index cb5c5d7e1f3d..cd59edcf6d71 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/i3c/device.h>
 #include <linux/slab.h>
diff --git a/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c b/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
index 4232a9d800fc..1948abce7cf6 100644
--- a/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
+++ b/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
@@ -12,7 +12,6 @@
 #include <linux/gfp_types.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 
 #include <linux/iio/common/st_sensors_i2c.h>
diff --git a/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c b/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c
index acea8a0757d7..8c5d8535e54c 100644
--- a/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c
+++ b/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/gfp_types.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/iio/light/al3000a.c b/drivers/iio/light/al3000a.c
index 9871096cbab3..43144683ed70 100644
--- a/drivers/iio/light/al3000a.c
+++ b/drivers/iio/light/al3000a.c
@@ -4,7 +4,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c
index 0932fa2b49fa..9a1d490c408b 100644
--- a/drivers/iio/light/al3010.c
+++ b/drivers/iio/light/al3010.c
@@ -18,7 +18,6 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index 63f5a85912fc..2f0a4bc936bc 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/light/bh1780.c b/drivers/iio/light/bh1780.c
index a740d1f992a8..c51ff2137785 100644
--- a/drivers/iio/light/bh1780.c
+++ b/drivers/iio/light/bh1780.c
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c
index bb90f738312a..2590fc8fd154 100644
--- a/drivers/iio/light/cm32181.c
+++ b/drivers/iio/light/cm32181.c
@@ -10,7 +10,6 @@
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/regulator/consumer.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/light/cm3232.c b/drivers/iio/light/cm3232.c
index 3a3ad6b4c468..2e824e005d18 100644
--- a/drivers/iio/light/cm3232.c
+++ b/drivers/iio/light/cm3232.c
@@ -10,7 +10,6 @@
 
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/init.h>
diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c
index 0c17378e27d1..98c84f33db60 100644
--- a/drivers/iio/light/cm3605.c
+++ b/drivers/iio/light/cm3605.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/events.h>
diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index 815806ceb5c8..891e065e48f1 100644
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -14,7 +14,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index 7e388319ee2e..6977bd0535b6 100644
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -40,7 +40,6 @@
 #include <linux/irq_work.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 384572844162..eee19b8bfc2c 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index efa904a70d0e..80fdcfbf4d72 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/light/isl29018.c b/drivers/iio/light/isl29018.c
index b6ab726d1dae..25ffc2718b65 100644
--- a/drivers/iio/light/isl29018.c
+++ b/drivers/iio/light/isl29018.c
@@ -10,7 +10,6 @@
 
 #include <linux/i2c.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/light/jsa1212.c b/drivers/iio/light/jsa1212.c
index 6978d02a4df5..b09d007880af 100644
--- a/drivers/iio/light/jsa1212.c
+++ b/drivers/iio/light/jsa1212.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
index 4d99ae336f61..93535675472d 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/err.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/light/ltrf216a.c b/drivers/iio/light/ltrf216a.c
index 5f27f754fe1c..ef7bef28393f 100644
--- a/drivers/iio/light/ltrf216a.c
+++ b/drivers/iio/light/ltrf216a.c
@@ -17,7 +17,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index 039d45af3a7f..102676e6aedf 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c
index 53bc455b7bad..0f44d4814ed0 100644
--- a/drivers/iio/light/opt3001.c
+++ b/drivers/iio/light/opt3001.c
@@ -16,7 +16,6 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/types.h>
diff --git a/drivers/iio/light/rpr0521.c b/drivers/iio/light/rpr0521.c
index 9341c1d58cbe..aeabf2f8b622 100644
--- a/drivers/iio/light/rpr0521.c
+++ b/drivers/iio/light/rpr0521.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/cleanup.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
diff --git a/drivers/iio/light/st_uvis25_i2c.c b/drivers/iio/light/st_uvis25_i2c.c
index 5d9bb4d9be63..a7ad5e1c1d3c 100644
--- a/drivers/iio/light/st_uvis25_i2c.c
+++ b/drivers/iio/light/st_uvis25_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/light/st_uvis25_spi.c b/drivers/iio/light/st_uvis25_spi.c
index a5aad74ce73e..c4c15093e9e5 100644
--- a/drivers/iio/light/st_uvis25_spi.c
+++ b/drivers/iio/light/st_uvis25_spi.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index a75a83594a7e..9bb7593e4104 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/iio/events.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index f2af1cd7c2d1..d1aab56bb8d9 100644
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
diff --git a/drivers/iio/light/us5182d.c b/drivers/iio/light/us5182d.c
index d2f5a44892a8..ed71a69be696 100644
--- a/drivers/iio/light/us5182d.c
+++ b/drivers/iio/light/us5182d.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/iio/events.h>
diff --git a/drivers/iio/light/veml6046x00.c b/drivers/iio/light/veml6046x00.c
index e60f24d46e7b..54a6cce64d0a 100644
--- a/drivers/iio/light/veml6046x00.c
+++ b/drivers/iio/light/veml6046x00.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/time.h>
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
index c1314b144367..924a1d48797b 100644
--- a/drivers/iio/light/vl6180.c
+++ b/drivers/iio/light/vl6180.c
@@ -16,7 +16,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <linux/err.h>
diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c
index 817b18257608..7a1034925449 100644
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@ -12,7 +12,6 @@
  * Author: Linus Walleij <linus.walleij@linaro.org>
  */
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index b648b0afa573..f27c7c2d31a0 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
diff --git a/drivers/iio/magnetometer/bmc150_magn_i2c.c b/drivers/iio/magnetometer/bmc150_magn_i2c.c
index b110791f688a..233d66eddb93 100644
--- a/drivers/iio/magnetometer/bmc150_magn_i2c.c
+++ b/drivers/iio/magnetometer/bmc150_magn_i2c.c
@@ -8,7 +8,6 @@
  * Copyright (c) 2016, Intel Corporation.
  */
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/magnetometer/bmc150_magn_spi.c b/drivers/iio/magnetometer/bmc150_magn_spi.c
index 896b1d280731..8af8d3528c43 100644
--- a/drivers/iio/magnetometer/bmc150_magn_spi.c
+++ b/drivers/iio/magnetometer/bmc150_magn_spi.c
@@ -8,7 +8,6 @@
  * Copyright (c) 2016, Intel Corporation.
  */
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index c673f9323e47..45c9300a56ba 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/magnetometer/mmc35240.c b/drivers/iio/magnetometer/mmc35240.c
index f3d48d03f7c3..4b382af50fa8 100644
--- a/drivers/iio/magnetometer/mmc35240.c
+++ b/drivers/iio/magnetometer/mmc35240.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/magnetometer/mmc5633.c b/drivers/iio/magnetometer/mmc5633.c
index 9d8e27486963..cc24d45a1253 100644
--- a/drivers/iio/magnetometer/mmc5633.c
+++ b/drivers/iio/magnetometer/mmc5633.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/magnetometer/si7210.c b/drivers/iio/magnetometer/si7210.c
index 2a36abd1c99d..540f03904e22 100644
--- a/drivers/iio/magnetometer/si7210.c
+++ b/drivers/iio/magnetometer/si7210.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index ed70e782af5e..ff4674782c89 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index 68816362bb95..69693e836ad7 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/magnetometer/tlv493d.c b/drivers/iio/magnetometer/tlv493d.c
index e5e050af2b74..a7545ef6bc95 100644
--- a/drivers/iio/magnetometer/tlv493d.c
+++ b/drivers/iio/magnetometer/tlv493d.c
@@ -14,7 +14,6 @@
 #include <linux/i2c.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/magnetometer/yamaha-yas530.c b/drivers/iio/magnetometer/yamaha-yas530.c
index c8a04f185dbb..57a41f7ebc42 100644
--- a/drivers/iio/magnetometer/yamaha-yas530.c
+++ b/drivers/iio/magnetometer/yamaha-yas530.c
@@ -29,7 +29,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/iio/multiplexer/iio-mux.c b/drivers/iio/multiplexer/iio-mux.c
index b742ca9a99d1..4421dafcf94e 100644
--- a/drivers/iio/multiplexer/iio-mux.c
+++ b/drivers/iio/multiplexer/iio-mux.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/iio/consumer.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/mux/consumer.h>
diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c
index 4e23a598a3fb..ea60611192f3 100644
--- a/drivers/iio/orientation/hid-sensor-incl-3d.c
+++ b/drivers/iio/orientation/hid-sensor-incl-3d.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/orientation/hid-sensor-rotation.c b/drivers/iio/orientation/hid-sensor-rotation.c
index 5a5e6e4fbe34..a44b2019e0a3 100644
--- a/drivers/iio/orientation/hid-sensor-rotation.c
+++ b/drivers/iio/orientation/hid-sensor-rotation.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/position/hid-sensor-custom-intel-hinge.c b/drivers/iio/position/hid-sensor-custom-intel-hinge.c
index a26d391661fd..bffa8fe4fe44 100644
--- a/drivers/iio/position/hid-sensor-custom-intel-hinge.c
+++ b/drivers/iio/position/hid-sensor-custom-intel-hinge.c
@@ -8,7 +8,6 @@
 #include <linux/iio/iio.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
diff --git a/drivers/iio/potentiometer/ad5272.c b/drivers/iio/potentiometer/ad5272.c
index 672b1ca3a920..f9b4f6597e5f 100644
--- a/drivers/iio/potentiometer/ad5272.c
+++ b/drivers/iio/potentiometer/ad5272.c
@@ -15,7 +15,6 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #define  AD5272_RDAC_WR  1
 #define  AD5272_RDAC_RD  2
diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
index 8a64d93f7e7b..73a70cca04c3 100644
--- a/drivers/iio/potentiometer/ds1803.c
+++ b/drivers/iio/potentiometer/ds1803.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #define DS1803_WIPER_0         0xA9
diff --git a/drivers/iio/potentiometer/max5432.c b/drivers/iio/potentiometer/max5432.c
index 26390be79d02..f6d3ec04fdcf 100644
--- a/drivers/iio/potentiometer/max5432.c
+++ b/drivers/iio/potentiometer/max5432.c
@@ -11,7 +11,6 @@
 #include <linux/iio/iio.h>
 #include <linux/limits.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 /* All chip variants have 32 wiper positions. */
diff --git a/drivers/iio/potentiometer/max5481.c b/drivers/iio/potentiometer/max5481.c
index b40e5ac218d7..ddf54a1df976 100644
--- a/drivers/iio/potentiometer/max5481.c
+++ b/drivers/iio/potentiometer/max5481.c
@@ -10,7 +10,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/iio/potentiometer/max5487.c b/drivers/iio/potentiometer/max5487.c
index 3b11b991940b..9541695af474 100644
--- a/drivers/iio/potentiometer/max5487.c
+++ b/drivers/iio/potentiometer/max5487.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2016 Cristina-Gabriela Moraru <cristina.moraru09@gmail.com>
  */
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/potentiometer/mcp4018.c b/drivers/iio/potentiometer/mcp4018.c
index a88bb2231850..b10b4b920dc0 100644
--- a/drivers/iio/potentiometer/mcp4018.c
+++ b/drivers/iio/potentiometer/mcp4018.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #define MCP4018_WIPER_MAX 127
diff --git a/drivers/iio/potentiometer/mcp41010.c b/drivers/iio/potentiometer/mcp41010.c
index f35fc4a6c55b..ed0764231224 100644
--- a/drivers/iio/potentiometer/mcp41010.c
+++ b/drivers/iio/potentiometer/mcp41010.c
@@ -21,7 +21,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/types.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/potentiometer/mcp4131.c b/drivers/iio/potentiometer/mcp4131.c
index 56c9111ef5e8..dad09ce6a75d 100644
--- a/drivers/iio/potentiometer/mcp4131.c
+++ b/drivers/iio/potentiometer/mcp4131.c
@@ -36,7 +36,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/types.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
index 9912e91ff7b4..7fb1fb5ab8a5 100644
--- a/drivers/iio/potentiometer/mcp4531.c
+++ b/drivers/iio/potentiometer/mcp4531.c
@@ -28,7 +28,6 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/potentiostat/lmp91000.c b/drivers/iio/potentiostat/lmp91000.c
index eccc2a34358f..3b4a90d14242 100644
--- a/drivers/iio/potentiostat/lmp91000.c
+++ b/drivers/iio/potentiostat/lmp91000.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
diff --git a/drivers/iio/pressure/abp2030pa_i2c.c b/drivers/iio/pressure/abp2030pa_i2c.c
index 9f1c1c8a9afb..7cb5fa176aac 100644
--- a/drivers/iio/pressure/abp2030pa_i2c.c
+++ b/drivers/iio/pressure/abp2030pa_i2c.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 
diff --git a/drivers/iio/pressure/abp2030pa_spi.c b/drivers/iio/pressure/abp2030pa_spi.c
index eaea9a3ebf11..8bc59eb499aa 100644
--- a/drivers/iio/pressure/abp2030pa_spi.c
+++ b/drivers/iio/pressure/abp2030pa_spi.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/errno.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/types.h>
diff --git a/drivers/iio/pressure/adp810.c b/drivers/iio/pressure/adp810.c
index 5282612d1309..b7e3f56f6d4a 100644
--- a/drivers/iio/pressure/adp810.c
+++ b/drivers/iio/pressure/adp810.c
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/types.h>
 #include <linux/unaligned.h>
diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index c6b950c596c1..7f546257d064 100644
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -14,7 +14,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 5f1d6abda3e4..f8ea7baf106d 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
diff --git a/drivers/iio/pressure/hp206c.c b/drivers/iio/pressure/hp206c.c
index abe10ccb6770..529e0ae732bb 100644
--- a/drivers/iio/pressure/hp206c.c
+++ b/drivers/iio/pressure/hp206c.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/pressure/hsc030pa.c b/drivers/iio/pressure/hsc030pa.c
index d6b18a84f0ab..0374d406b401 100644
--- a/drivers/iio/pressure/hsc030pa.c
+++ b/drivers/iio/pressure/hsc030pa.c
@@ -13,7 +13,6 @@
 #include <linux/cleanup.h>
 #include <linux/init.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/printk.h>
 #include <linux/property.h>
diff --git a/drivers/iio/pressure/hsc030pa_i2c.c b/drivers/iio/pressure/hsc030pa_i2c.c
index 3500bda03d75..8f1189b3c034 100644
--- a/drivers/iio/pressure/hsc030pa_i2c.c
+++ b/drivers/iio/pressure/hsc030pa_i2c.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 
diff --git a/drivers/iio/pressure/hsc030pa_spi.c b/drivers/iio/pressure/hsc030pa_spi.c
index 5d331b3b6da8..be58e550cc12 100644
--- a/drivers/iio/pressure/hsc030pa_spi.c
+++ b/drivers/iio/pressure/hsc030pa_spi.c
@@ -10,7 +10,6 @@
 
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/stddef.h>
diff --git a/drivers/iio/pressure/icp10100.c b/drivers/iio/pressure/icp10100.c
index 3d83d0098a57..d67be19d8198 100644
--- a/drivers/iio/pressure/icp10100.c
+++ b/drivers/iio/pressure/icp10100.c
@@ -10,7 +10,6 @@
 
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/pm_runtime.h>
 #include <linux/crc8.h>
diff --git a/drivers/iio/pressure/mprls0025pa.c b/drivers/iio/pressure/mprls0025pa.c
index e8c495f336ff..c21f0a050660 100644
--- a/drivers/iio/pressure/mprls0025pa.c
+++ b/drivers/iio/pressure/mprls0025pa.c
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/string.h>
diff --git a/drivers/iio/pressure/mprls0025pa_i2c.c b/drivers/iio/pressure/mprls0025pa_i2c.c
index 0fe8cfe0d7e7..e0dce9713df1 100644
--- a/drivers/iio/pressure/mprls0025pa_i2c.c
+++ b/drivers/iio/pressure/mprls0025pa_i2c.c
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/types.h>
 
diff --git a/drivers/iio/pressure/mprls0025pa_spi.c b/drivers/iio/pressure/mprls0025pa_spi.c
index 8c8c726f703f..23f47c04ed45 100644
--- a/drivers/iio/pressure/mprls0025pa_spi.c
+++ b/drivers/iio/pressure/mprls0025pa_spi.c
@@ -11,7 +11,6 @@
 #include <linux/array_size.h>
 #include <linux/device.h>
 #include <linux/errno.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/stddef.h>
diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c
index 1c041b9085fb..ddf6fc4751e9 100644
--- a/drivers/iio/pressure/ms5611_i2c.c
+++ b/drivers/iio/pressure/ms5611_i2c.c
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/unaligned.h>
 
diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c
index 25c7bd2d8fdf..c41aaa6244cd 100644
--- a/drivers/iio/pressure/ms5611_spi.c
+++ b/drivers/iio/pressure/ms5611_spi.c
@@ -9,7 +9,6 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/unaligned.h>
 
diff --git a/drivers/iio/pressure/ms5637.c b/drivers/iio/pressure/ms5637.c
index 59705a666979..e6f455ff5794 100644
--- a/drivers/iio/pressure/ms5637.c
+++ b/drivers/iio/pressure/ms5637.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/pressure/sdp500.c b/drivers/iio/pressure/sdp500.c
index 9828c73c4855..f7576d1c9a4b 100644
--- a/drivers/iio/pressure/sdp500.c
+++ b/drivers/iio/pressure/sdp500.c
@@ -8,7 +8,6 @@
 #include <linux/i2c.h>
 #include <linux/crc8.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/unaligned.h>
 
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 0f50bac1fb4d..1a5f8299572b 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index 39827e6841ca..d843186b44af 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -9,7 +9,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 
diff --git a/drivers/iio/pressure/zpa2326_i2c.c b/drivers/iio/pressure/zpa2326_i2c.c
index a6034bf05d97..fd28e11050bc 100644
--- a/drivers/iio/pressure/zpa2326_i2c.c
+++ b/drivers/iio/pressure/zpa2326_i2c.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include "zpa2326.h"
 
 /*
diff --git a/drivers/iio/pressure/zpa2326_spi.c b/drivers/iio/pressure/zpa2326_spi.c
index af756e2b0f31..73e37a77c933 100644
--- a/drivers/iio/pressure/zpa2326_spi.c
+++ b/drivers/iio/pressure/zpa2326_spi.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
-#include <linux/mod_devicetable.h>
 #include "zpa2326.h"
 
 /*
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index f1018b14aecf..3406232822cb 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
diff --git a/drivers/iio/proximity/cros_ec_mkbp_proximity.c b/drivers/iio/proximity/cros_ec_mkbp_proximity.c
index 1f9de7066ebf..63f9b45bef7b 100644
--- a/drivers/iio/proximity/cros_ec_mkbp_proximity.c
+++ b/drivers/iio/proximity/cros_ec_mkbp_proximity.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
diff --git a/drivers/iio/proximity/d3323aa.c b/drivers/iio/proximity/d3323aa.c
index 30821f583454..d40e3dff9eb1 100644
--- a/drivers/iio/proximity/d3323aa.c
+++ b/drivers/iio/proximity/d3323aa.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/iio/proximity/hx9023s.c b/drivers/iio/proximity/hx9023s.c
index 9efaa5b6b5bd..e4be0b945481 100644
--- a/drivers/iio/proximity/hx9023s.c
+++ b/drivers/iio/proximity/hx9023s.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/irqreturn.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
diff --git a/drivers/iio/proximity/isl29501.c b/drivers/iio/proximity/isl29501.c
index f69db6f2f380..fab7fe9fb85b 100644
--- a/drivers/iio/proximity/isl29501.c
+++ b/drivers/iio/proximity/isl29501.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 
diff --git a/drivers/iio/proximity/mb1232.c b/drivers/iio/proximity/mb1232.c
index 34b49c54e68b..eccf54db4344 100644
--- a/drivers/iio/proximity/mb1232.c
+++ b/drivers/iio/proximity/mb1232.c
@@ -14,7 +14,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 
diff --git a/drivers/iio/proximity/ping.c b/drivers/iio/proximity/ping.c
index e3487094d7be..1e646b858468 100644
--- a/drivers/iio/proximity/ping.c
+++ b/drivers/iio/proximity/ping.c
@@ -29,7 +29,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
index 21336b8f122a..d1ec193eadaf 100644
--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
+++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/proximity/srf04.c b/drivers/iio/proximity/srf04.c
index e97f9a20ac7a..7be50bdebfcb 100644
--- a/drivers/iio/proximity/srf04.c
+++ b/drivers/iio/proximity/srf04.c
@@ -37,7 +37,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index fb02eac78ed4..8c276422fa94 100644
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/property.h>
diff --git a/drivers/iio/proximity/sx9324.c b/drivers/iio/proximity/sx9324.c
index f61eff39751d..5bc9b06a92ff 100644
--- a/drivers/iio/proximity/sx9324.c
+++ b/drivers/iio/proximity/sx9324.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/property.h>
diff --git a/drivers/iio/proximity/sx9360.c b/drivers/iio/proximity/sx9360.c
index 4448988d4e7e..b49d95b6ecff 100644
--- a/drivers/iio/proximity/sx9360.c
+++ b/drivers/iio/proximity/sx9360.c
@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/property.h>
diff --git a/drivers/iio/proximity/vl53l1x-i2c.c b/drivers/iio/proximity/vl53l1x-i2c.c
index 4d9cb3983dba..9efb48458203 100644
--- a/drivers/iio/proximity/vl53l1x-i2c.c
+++ b/drivers/iio/proximity/vl53l1x-i2c.c
@@ -24,7 +24,6 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/iio/resolver/ad2s1200.c b/drivers/iio/resolver/ad2s1200.c
index c00a60cb31a5..55bcbbd4021a 100644
--- a/drivers/iio/resolver/ad2s1200.c
+++ b/drivers/iio/resolver/ad2s1200.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/spi/spi.h>
 #include <linux/sysfs.h>
diff --git a/drivers/iio/temperature/hid-sensor-temperature.c b/drivers/iio/temperature/hid-sensor-temperature.c
index 9f628a8e5cfb..54a00253de11 100644
--- a/drivers/iio/temperature/hid-sensor-temperature.c
+++ b/drivers/iio/temperature/hid-sensor-temperature.c
@@ -8,7 +8,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/iio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "../common/hid-sensors/hid-sensor-trigger.h"
diff --git a/drivers/iio/temperature/ltc2983.c b/drivers/iio/temperature/ltc2983.c
index 38e6f8dfd3b8..6436628ab05c 100644
--- a/drivers/iio/temperature/ltc2983.c
+++ b/drivers/iio/temperature/ltc2983.c
@@ -14,7 +14,6 @@
 #include <linux/iio/iio.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/iio/temperature/max31856.c b/drivers/iio/temperature/max31856.c
index 7ddec5cbe558..13405f3ba829 100644
--- a/drivers/iio/temperature/max31856.c
+++ b/drivers/iio/temperature/max31856.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/ctype.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
diff --git a/drivers/iio/temperature/max31865.c b/drivers/iio/temperature/max31865.c
index 5a6fbe3c80e5..82cf06c4d272 100644
--- a/drivers/iio/temperature/max31865.c
+++ b/drivers/iio/temperature/max31865.c
@@ -12,7 +12,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index 205939680fd4..a0b68695b6ab 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/iio/temperature/mcp9600.c b/drivers/iio/temperature/mcp9600.c
index 69baf654c9c0..563330b47e9c 100644
--- a/drivers/iio/temperature/mcp9600.c
+++ b/drivers/iio/temperature/mcp9600.c
@@ -16,7 +16,6 @@
 #include <linux/irq.h>
 #include <linux/math.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include <linux/iio/events.h>
diff --git a/drivers/iio/temperature/mlx90614.c b/drivers/iio/temperature/mlx90614.c
index 1ad21b73e1b4..a391cc4019e8 100644
--- a/drivers/iio/temperature/mlx90614.c
+++ b/drivers/iio/temperature/mlx90614.c
@@ -28,7 +28,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 
diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/temperature/mlx90632.c
index b44f7036c2cc..3f6162bb55b9 100644
--- a/drivers/iio/temperature/mlx90632.c
+++ b/drivers/iio/temperature/mlx90632.c
@@ -16,7 +16,6 @@
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/limits.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/math64.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/temperature/mlx90635.c b/drivers/iio/temperature/mlx90635.c
index 1c8948ca54df..946c724bfcd9 100644
--- a/drivers/iio/temperature/mlx90635.c
+++ b/drivers/iio/temperature/mlx90635.c
@@ -16,7 +16,6 @@
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/limits.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/math64.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
index d8d8c8936d17..ccf6029e7a8f 100644
--- a/drivers/iio/temperature/tmp006.c
+++ b/drivers/iio/temperature/tmp006.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/iio/temperature/tmp007.c b/drivers/iio/temperature/tmp007.c
index 043283b02c4d..869222610a6d 100644
--- a/drivers/iio/temperature/tmp007.c
+++ b/drivers/iio/temperature/tmp007.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
-#include <linux/mod_devicetable.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 
diff --git a/drivers/iio/temperature/tsys01.c b/drivers/iio/temperature/tsys01.c
index 104dd45598b0..b1716adb8002 100644
--- a/drivers/iio/temperature/tsys01.c
+++ b/drivers/iio/temperature/tsys01.c
@@ -13,7 +13,6 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/stat.h>
diff --git a/drivers/iio/trigger/stm32-lptimer-trigger.c b/drivers/iio/trigger/stm32-lptimer-trigger.c
index c7bab18221c7..828890fe353c 100644
--- a/drivers/iio/trigger/stm32-lptimer-trigger.c
+++ b/drivers/iio/trigger/stm32-lptimer-trigger.c
@@ -12,7 +12,6 @@
 #include <linux/export.h>
 #include <linux/iio/timer/stm32-lptim-trigger.h>
 #include <linux/mfd/stm32-lptimer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
index 3b9a3a6cbb25..4f6ff1e72f2e 100644
--- a/drivers/iio/trigger/stm32-timer-trigger.c
+++ b/drivers/iio/trigger/stm32-timer-trigger.c
@@ -12,7 +12,6 @@
 #include <linux/iio/timer/stm32-timer-trigger.h>
 #include <linux/iio/trigger.h>
 #include <linux/mfd/stm32-timers.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/input/keyboard/adp5585-keys.c b/drivers/input/keyboard/adp5585-keys.c
index 4208229e1356..017c95029180 100644
--- a/drivers/input/keyboard/adp5585-keys.c
+++ b/drivers/input/keyboard/adp5585-keys.c
@@ -13,7 +13,6 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/mfd/adp5585.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/notifier.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 414fbef4abf9..25d4502c85bc 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -20,7 +20,6 @@
 #include <linux/irq.h>
 #include <linux/ktime.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/input/keyboard/charlieplex_keypad.c b/drivers/input/keyboard/charlieplex_keypad.c
index 6dbb5c183f02..d222b622c820 100644
--- a/drivers/input/keyboard/charlieplex_keypad.c
+++ b/drivers/input/keyboard/charlieplex_keypad.c
@@ -17,7 +17,6 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/string_helpers.h>
diff --git a/drivers/input/keyboard/clps711x-keypad.c b/drivers/input/keyboard/clps711x-keypad.c
index 4c1a3e611edd..ddabd789861b 100644
--- a/drivers/input/keyboard/clps711x-keypad.c
+++ b/drivers/input/keyboard/clps711x-keypad.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/input.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/gpio/consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index 817c23438f6e..9ea926a4c95b 100644
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/bits.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/input/keyboard/max7360-keypad.c b/drivers/input/keyboard/max7360-keypad.c
index 503be952b0a6..1e5251f87f6f 100644
--- a/drivers/input/keyboard/max7360-keypad.c
+++ b/drivers/input/keyboard/max7360-keypad.c
@@ -15,7 +15,6 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/max7360.h>
-#include <linux/mod_devicetable.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
 #include <linux/property.h>
diff --git a/drivers/input/keyboard/pinephone-keyboard.c b/drivers/input/keyboard/pinephone-keyboard.c
index 147b1f288a33..86f21045c69b 100644
--- a/drivers/input/keyboard/pinephone-keyboard.c
+++ b/drivers/input/keyboard/pinephone-keyboard.c
@@ -10,7 +10,6 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/regulator/consumer.h>
 #include <linux/types.h>
diff --git a/drivers/input/misc/ariel-pwrbutton.c b/drivers/input/misc/ariel-pwrbutton.c
index cdc80715b5fd..f0e06ee604d6 100644
--- a/drivers/input/misc/ariel-pwrbutton.c
+++ b/drivers/input/misc/ariel-pwrbutton.c
@@ -9,7 +9,6 @@
 #include <linux/gfp.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 
diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c
index c338765e0ecd..830714241788 100644
--- a/drivers/input/misc/da9063_onkey.c
+++ b/drivers/input/misc/da9063_onkey.c
@@ -9,7 +9,6 @@
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_wakeirq.h>
 #include <linux/property.h>
diff --git a/drivers/input/misc/gpio_decoder.c b/drivers/input/misc/gpio_decoder.c
index f0759dd39b35..0e4a49845afa 100644
--- a/drivers/input/misc/gpio_decoder.c
+++ b/drivers/input/misc/gpio_decoder.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/input.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/input/misc/iqs269a.c b/drivers/input/misc/iqs269a.c
index 1851848e2cd3..7a576f65bfca 100644
--- a/drivers/input/misc/iqs269a.c
+++ b/drivers/input/misc/iqs269a.c
@@ -18,7 +18,6 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/input/misc/iqs626a.c b/drivers/input/misc/iqs626a.c
index 7fba4a8edceb..bc50dfba9e6c 100644
--- a/drivers/input/misc/iqs626a.c
+++ b/drivers/input/misc/iqs626a.c
@@ -19,7 +19,6 @@
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/input/misc/iqs7222.c b/drivers/input/misc/iqs7222.c
index ff23219a582a..ace489482734 100644
--- a/drivers/input/misc/iqs7222.c
+++ b/drivers/input/misc/iqs7222.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/ktime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/slab.h>
diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
index 0c661140fb88..c8b39643c104 100644
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
@@ -11,7 +11,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/input.h>
-#include <linux/mod_devicetable.h>
 
 #define MMA8450_DRV_NAME	"mma8450"
 
diff --git a/drivers/input/misc/rt5120-pwrkey.c b/drivers/input/misc/rt5120-pwrkey.c
index 8a8c1aeeed05..2262f5057d9f 100644
--- a/drivers/input/misc/rt5120-pwrkey.c
+++ b/drivers/input/misc/rt5120-pwrkey.c
@@ -9,7 +9,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/input/misc/sc27xx-vibra.c b/drivers/input/misc/sc27xx-vibra.c
index 1478017f0968..7590f3a91db8 100644
--- a/drivers/input/misc/sc27xx-vibra.c
+++ b/drivers/input/misc/sc27xx-vibra.c
@@ -5,7 +5,6 @@
 
 #include <linux/device.h>
 #include <linux/input.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index b0feef19515d..3e94a5995766 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -27,7 +27,6 @@
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/twl.h>
diff --git a/drivers/input/serio/sun4i-ps2.c b/drivers/input/serio/sun4i-ps2.c
index a9812789771c..6a9adcca41e4 100644
--- a/drivers/input/serio/sun4i-ps2.c
+++ b/drivers/input/serio/sun4i-ps2.c
@@ -13,7 +13,6 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #define DRIVER_NAME		"sun4i-ps2"
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 411d55ca1a66..ddc4618d8039 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -14,7 +14,6 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
diff --git a/drivers/input/touchscreen/cyttsp5.c b/drivers/input/touchscreen/cyttsp5.c
index 47f4271395a6..b304dd3c49d0 100644
--- a/drivers/input/touchscreen/cyttsp5.c
+++ b/drivers/input/touchscreen/cyttsp5.c
@@ -18,7 +18,6 @@
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/unaligned.h>
diff --git a/drivers/input/touchscreen/himax_hx852x.c b/drivers/input/touchscreen/himax_hx852x.c
index 83c60e137a55..1c488a63e53b 100644
--- a/drivers/input/touchscreen/himax_hx852x.c
+++ b/drivers/input/touchscreen/himax_hx852x.c
@@ -16,7 +16,6 @@
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/input/touchscreen/hynitron_cstxxx.c b/drivers/input/touchscreen/hynitron_cstxxx.c
index 1d8ca90dcda6..f6139b1a8681 100644
--- a/drivers/input/touchscreen/hynitron_cstxxx.c
+++ b/drivers/input/touchscreen/hynitron_cstxxx.c
@@ -19,7 +19,6 @@
 #include <linux/input.h>
 #include <linux/input/mt.h>
 #include <linux/input/touchscreen.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/unaligned.h>
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 3bf524a6ee20..bf17810ff376 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -8,7 +8,6 @@
 #include <linux/input/mt.h>
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c
index 587665e4e6fd..726ea1f6f78a 100644
--- a/drivers/input/touchscreen/iqs5xx.c
+++ b/drivers/input/touchscreen/iqs5xx.c
@@ -24,7 +24,6 @@
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/unaligned.h>
diff --git a/drivers/input/touchscreen/msg2638.c b/drivers/input/touchscreen/msg2638.c
index 240d2eebf1c9..cd40c284d6f4 100644
--- a/drivers/input/touchscreen/msg2638.c
+++ b/drivers/input/touchscreen/msg2638.c
@@ -19,7 +19,6 @@
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/input/touchscreen/resistive-adc-touch.c b/drivers/input/touchscreen/resistive-adc-touch.c
index 7e761ec73273..68f7e2e28f37 100644
--- a/drivers/input/touchscreen/resistive-adc-touch.c
+++ b/drivers/input/touchscreen/resistive-adc-touch.c
@@ -13,7 +13,6 @@
 #include <linux/input/touchscreen.h>
 #include <linux/iio/consumer.h>
 #include <linux/iio/iio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
index 524f14eb3da2..51d0a6635ff7 100644
--- a/drivers/input/touchscreen/tsc2007_core.c
+++ b/drivers/input/touchscreen/tsc2007_core.c
@@ -24,7 +24,6 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/platform_data/tsc2007.h>
 #include "tsc2007.h"
diff --git a/drivers/interconnect/mediatek/mt8183.c b/drivers/interconnect/mediatek/mt8183.c
index c212e79334cf..ed607a8b86cf 100644
--- a/drivers/interconnect/mediatek/mt8183.c
+++ b/drivers/interconnect/mediatek/mt8183.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/mediatek,mt8183.h>
diff --git a/drivers/interconnect/mediatek/mt8195.c b/drivers/interconnect/mediatek/mt8195.c
index 3ca23469ab18..0f0767639f19 100644
--- a/drivers/interconnect/mediatek/mt8195.c
+++ b/drivers/interconnect/mediatek/mt8195.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/mediatek,mt8195.h>
diff --git a/drivers/interconnect/mediatek/mt8196.c b/drivers/interconnect/mediatek/mt8196.c
index e9af32065be1..df5a975f0ad6 100644
--- a/drivers/interconnect/mediatek/mt8196.c
+++ b/drivers/interconnect/mediatek/mt8196.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/mediatek,mt8196.h>
diff --git a/drivers/interconnect/qcom/msm8909.c b/drivers/interconnect/qcom/msm8909.c
index dd656ce7b64d..e222cba14b8e 100644
--- a/drivers/interconnect/qcom/msm8909.c
+++ b/drivers/interconnect/qcom/msm8909.c
@@ -6,7 +6,6 @@
 
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/msm8937.c b/drivers/interconnect/qcom/msm8937.c
index 58533d00266b..a9a84f276e1b 100644
--- a/drivers/interconnect/qcom/msm8937.c
+++ b/drivers/interconnect/qcom/msm8937.c
@@ -6,7 +6,6 @@
 
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/msm8939.c b/drivers/interconnect/qcom/msm8939.c
index b52c5ac1175c..fe249e906259 100644
--- a/drivers/interconnect/qcom/msm8939.c
+++ b/drivers/interconnect/qcom/msm8939.c
@@ -9,7 +9,6 @@
 #include <linux/interconnect-provider.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/interconnect/qcom/msm8953.c b/drivers/interconnect/qcom/msm8953.c
index be2b1a606612..cc984ecd49aa 100644
--- a/drivers/interconnect/qcom/msm8953.c
+++ b/drivers/interconnect/qcom/msm8953.c
@@ -2,7 +2,6 @@
 
 #include <linux/clk.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/interconnect/qcom/msm8976.c b/drivers/interconnect/qcom/msm8976.c
index 4e2ac7ebe742..c219dcfd43b6 100644
--- a/drivers/interconnect/qcom/msm8976.c
+++ b/drivers/interconnect/qcom/msm8976.c
@@ -6,7 +6,6 @@
 
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c
index 84cfafb22aa1..882f9d2b6d4e 100644
--- a/drivers/interconnect/qcom/msm8996.c
+++ b/drivers/interconnect/qcom/msm8996.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/qcm2290.c b/drivers/interconnect/qcom/qcm2290.c
index e120bc1395f3..d4a8142c6ac4 100644
--- a/drivers/interconnect/qcom/qcm2290.c
+++ b/drivers/interconnect/qcom/qcm2290.c
@@ -10,7 +10,6 @@
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/qcs404.c b/drivers/interconnect/qcom/qcs404.c
index ceac7a698769..fdd9f908a48b 100644
--- a/drivers/interconnect/qcom/qcs404.c
+++ b/drivers/interconnect/qcom/qcs404.c
@@ -8,7 +8,6 @@
 #include <linux/interconnect-provider.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/interconnect/qcom/qdu1000.c b/drivers/interconnect/qcom/qdu1000.c
index 0006413241dc..5fd6eee0568f 100644
--- a/drivers/interconnect/qcom/qdu1000.c
+++ b/drivers/interconnect/qcom/qdu1000.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,qdu1000-rpmh.h>
diff --git a/drivers/interconnect/qcom/sa8775p.c b/drivers/interconnect/qcom/sa8775p.c
index 6a49abc96efe..998a22d9d46d 100644
--- a/drivers/interconnect/qcom/sa8775p.c
+++ b/drivers/interconnect/qcom/sa8775p.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sa8775p-rpmh.h>
diff --git a/drivers/interconnect/qcom/sc7180.c b/drivers/interconnect/qcom/sc7180.c
index 0ea06facf81e..a2f5445c1954 100644
--- a/drivers/interconnect/qcom/sc7180.c
+++ b/drivers/interconnect/qcom/sc7180.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sc7180.h>
diff --git a/drivers/interconnect/qcom/sc7280.c b/drivers/interconnect/qcom/sc7280.c
index c4cb6443f2d4..da21db2bdb7f 100644
--- a/drivers/interconnect/qcom/sc7280.c
+++ b/drivers/interconnect/qcom/sc7280.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sc7280.h>
diff --git a/drivers/interconnect/qcom/sc8180x.c b/drivers/interconnect/qcom/sc8180x.c
index c9bf1af54e37..fef77cd2bf69 100644
--- a/drivers/interconnect/qcom/sc8180x.c
+++ b/drivers/interconnect/qcom/sc8180x.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/interconnect/qcom,sc8180x.h>
diff --git a/drivers/interconnect/qcom/sc8280xp.c b/drivers/interconnect/qcom/sc8280xp.c
index ed2161da37bf..4110536664d0 100644
--- a/drivers/interconnect/qcom/sc8280xp.c
+++ b/drivers/interconnect/qcom/sc8280xp.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sc8280xp.h>
diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c
index 7392bebba334..d8c979a12235 100644
--- a/drivers/interconnect/qcom/sdm660.c
+++ b/drivers/interconnect/qcom/sdm660.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/sdm670.c b/drivers/interconnect/qcom/sdm670.c
index 88f4768b765c..9280921d44d2 100644
--- a/drivers/interconnect/qcom/sdm670.c
+++ b/drivers/interconnect/qcom/sdm670.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sdm670-rpmh.h>
diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
index 6d5bbeda0689..1c434fd12ead 100644
--- a/drivers/interconnect/qcom/sdm845.c
+++ b/drivers/interconnect/qcom/sdm845.c
@@ -7,7 +7,6 @@
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/interconnect/qcom,sdm845.h>
diff --git a/drivers/interconnect/qcom/sdx55.c b/drivers/interconnect/qcom/sdx55.c
index 75ced1286919..876788a14e6e 100644
--- a/drivers/interconnect/qcom/sdx55.c
+++ b/drivers/interconnect/qcom/sdx55.c
@@ -10,7 +10,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sdx55.h>
diff --git a/drivers/interconnect/qcom/sdx65.c b/drivers/interconnect/qcom/sdx65.c
index 6c5b4e1ec82f..92003df39ea4 100644
--- a/drivers/interconnect/qcom/sdx65.c
+++ b/drivers/interconnect/qcom/sdx65.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sdx65.h>
diff --git a/drivers/interconnect/qcom/sm6115.c b/drivers/interconnect/qcom/sm6115.c
index 3ee12c8a4d56..e1cd898bc943 100644
--- a/drivers/interconnect/qcom/sm6115.c
+++ b/drivers/interconnect/qcom/sm6115.c
@@ -8,7 +8,6 @@
 #include <dt-bindings/interconnect/qcom,sm6115.h>
 #include <linux/device.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/interconnect/qcom/sm6350.c b/drivers/interconnect/qcom/sm6350.c
index d96bec1cbb26..c098c608b836 100644
--- a/drivers/interconnect/qcom/sm6350.c
+++ b/drivers/interconnect/qcom/sm6350.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sm6350.h>
diff --git a/drivers/interconnect/qcom/sm7150.c b/drivers/interconnect/qcom/sm7150.c
index 0390d0468b48..d212a50e3cbb 100644
--- a/drivers/interconnect/qcom/sm7150.c
+++ b/drivers/interconnect/qcom/sm7150.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sm7150-rpmh.h>
diff --git a/drivers/interconnect/qcom/sm8150.c b/drivers/interconnect/qcom/sm8150.c
index ae732afbd155..eb1e61599e3a 100644
--- a/drivers/interconnect/qcom/sm8150.c
+++ b/drivers/interconnect/qcom/sm8150.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sm8150.h>
diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c
index 2ed112eab155..2b811b5cd216 100644
--- a/drivers/interconnect/qcom/sm8250.c
+++ b/drivers/interconnect/qcom/sm8250.c
@@ -7,7 +7,6 @@
 #include <linux/device.h>
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sm8250.h>
diff --git a/drivers/interconnect/qcom/sm8350.c b/drivers/interconnect/qcom/sm8350.c
index bb793d724893..d92c26bee595 100644
--- a/drivers/interconnect/qcom/sm8350.c
+++ b/drivers/interconnect/qcom/sm8350.c
@@ -7,7 +7,6 @@
 
 #include <linux/interconnect-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <dt-bindings/interconnect/qcom,sm8350.h>
 
diff --git a/drivers/interconnect/qcom/sm8450.c b/drivers/interconnect/qcom/sm8450.c
index c88327d200ac..54c860b16eb0 100644
--- a/drivers/interconnect/qcom/sm8450.c
+++ b/drivers/interconnect/qcom/sm8450.c
@@ -8,7 +8,6 @@
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <dt-bindings/interconnect/qcom,sm8450.h>
diff --git a/drivers/interconnect/qcom/sm8550.c b/drivers/interconnect/qcom/sm8550.c
index d01762e13272..535097eab537 100644
--- a/drivers/interconnect/qcom/sm8550.c
+++ b/drivers/interconnect/qcom/sm8550.c
@@ -10,7 +10,6 @@
 #include <linux/interconnect.h>
 #include <linux/interconnect-provider.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <dt-bindings/interconnect/qcom,sm8550-rpmh.h>
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
index 65e0ef6539fe..531b29fbf492 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
@@ -10,7 +10,6 @@
 #include <linux/firmware/qcom/qcom_scm.h>
 #include <linux/iopoll.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/ratelimit.h>
diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c
index 5f9b204d350b..47c2681d138a 100644
--- a/drivers/irqchip/irq-imx-intmux.c
+++ b/drivers/irqchip/irq-imx-intmux.c
@@ -50,7 +50,6 @@
 #include <linux/irqchip/chained_irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
diff --git a/drivers/irqchip/irq-lan966x-oic.c b/drivers/irqchip/irq-lan966x-oic.c
index 11d3a0ffa261..8af08d0e4182 100644
--- a/drivers/irqchip/irq-lan966x-oic.c
+++ b/drivers/irqchip/irq-lan966x-oic.c
@@ -14,7 +14,6 @@
 #include <linux/irqchip/chained_irq.h>
 #include <linux/irqchip.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/irqchip/irq-sl28cpld.c b/drivers/irqchip/irq-sl28cpld.c
index e50f9eaba4cd..9892c020e0be 100644
--- a/drivers/irqchip/irq-sl28cpld.c
+++ b/drivers/irqchip/irq-sl28cpld.c
@@ -7,7 +7,6 @@
 
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/irqchip/irq-stm32mp-exti.c b/drivers/irqchip/irq-stm32mp-exti.c
index a24f4f1a4f8f..bf3a2def69ca 100644
--- a/drivers/irqchip/irq-stm32mp-exti.c
+++ b/drivers/irqchip/irq-stm32mp-exti.c
@@ -12,7 +12,6 @@
 #include <linux/irq.h>
 #include <linux/irqchip.h>
 #include <linux/irqdomain.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
diff --git a/drivers/leds/flash/leds-rt8515.c b/drivers/leds/flash/leds-rt8515.c
index f6b439674c03..00904cc90ed6 100644
--- a/drivers/leds/flash/leds-rt8515.c
+++ b/drivers/leds/flash/leds-rt8515.c
@@ -26,7 +26,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/led-class-flash.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/leds/leds-aw200xx.c b/drivers/leds/leds-aw200xx.c
index 0d90eeb6448f..b92158ac9ce3 100644
--- a/drivers/leds/leds-aw200xx.c
+++ b/drivers/leds/leds-aw200xx.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/drivers/leds/leds-bd2606mvv.c b/drivers/leds/leds-bd2606mvv.c
index c1181a35d0f7..4c696abfd23d 100644
--- a/drivers/leds/leds-bd2606mvv.c
+++ b/drivers/leds/leds-bd2606mvv.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
diff --git a/drivers/leds/leds-cht-wcove.c b/drivers/leds/leds-cht-wcove.c
index 9a609dd5acdc..da05ff94898d 100644
--- a/drivers/leds/leds-cht-wcove.c
+++ b/drivers/leds/leds-cht-wcove.c
@@ -14,7 +14,6 @@
 #include <linux/leds.h>
 #include <linux/mfd/intel_soc_pmic.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/suspend.h>
diff --git a/drivers/leds/leds-cr0014114.c b/drivers/leds/leds-cr0014114.c
index 7e51c374edd4..3f6931ae0bcc 100644
--- a/drivers/leds/leds-cr0014114.c
+++ b/drivers/leds/leds-cr0014114.c
@@ -4,7 +4,6 @@
 
 #include <linux/delay.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/workqueue.h>
diff --git a/drivers/leds/leds-cros_ec.c b/drivers/leds/leds-cros_ec.c
index 6592ceee866a..1844d0cd5f52 100644
--- a/drivers/leds/leds-cros_ec.c
+++ b/drivers/leds/leds-cros_ec.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 #include <linux/led-class-multicolor.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c
index e26d1654bd0d..8e8ddd7c514d 100644
--- a/drivers/leds/leds-el15203000.c
+++ b/drivers/leds/leds-el15203000.c
@@ -4,7 +4,6 @@
 
 #include <linux/delay.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index a3428b22de3a..8ae71c2e91e0 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -12,7 +12,6 @@
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/overflow.h>
 #include <linux/pinctrl/consumer.h>
diff --git a/drivers/leds/leds-is31fl319x.c b/drivers/leds/leds-is31fl319x.c
index 80f38dba0fba..5206082b7722 100644
--- a/drivers/leds/leds-is31fl319x.c
+++ b/drivers/leds/leds-is31fl319x.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/leds/leds-lm36274.c b/drivers/leds/leds-lm36274.c
index e009b6d17915..7fd8365c2f7b 100644
--- a/drivers/leds/leds-lm36274.c
+++ b/drivers/leds/leds-lm36274.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/leds.h>
 #include <linux/leds-ti-lmu-common.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c
index 95b850a3b31c..8d2678dc9e4f 100644
--- a/drivers/leds/leds-lm3692x.c
+++ b/drivers/leds/leds-lm3692x.c
@@ -7,7 +7,6 @@
 #include <linux/init.h>
 #include <linux/leds.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/drivers/leds/leds-lm3697.c b/drivers/leds/leds-lm3697.c
index 933191fb2be0..83dc607a6987 100644
--- a/drivers/leds/leds-lm3697.c
+++ b/drivers/leds/leds-lm3697.c
@@ -5,7 +5,6 @@
 #include <linux/bits.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
index 259169214aaf..20bfb315bda1 100644
--- a/drivers/leds/leds-lp50xx.c
+++ b/drivers/leds/leds-lp50xx.c
@@ -6,7 +6,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index d0160fde0f94..6fca14e76ca6 100644
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/slab.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 
diff --git a/drivers/leds/leds-max5970.c b/drivers/leds/leds-max5970.c
index a1e91a06249c..cb4dd0a9166c 100644
--- a/drivers/leds/leds-max5970.c
+++ b/drivers/leds/leds-max5970.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 #include <linux/mfd/max5970.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/leds/leds-mlxcpld.c b/drivers/leds/leds-mlxcpld.c
index f25f68789281..1f5ab8fbdaf9 100644
--- a/drivers/leds/leds-mlxcpld.c
+++ b/drivers/leds/leds-mlxcpld.c
@@ -39,7 +39,6 @@
 #include <linux/io.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/leds/leds-nic78bx.c b/drivers/leds/leds-nic78bx.c
index f3161266b8ad..5e3098e1e1ad 100644
--- a/drivers/leds/leds-nic78bx.c
+++ b/drivers/leds/leds-nic78bx.c
@@ -11,7 +11,6 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
diff --git a/drivers/leds/leds-pca995x.c b/drivers/leds/leds-pca995x.c
index 59951207fd04..fee6216cd1bd 100644
--- a/drivers/leds/leds-pca995x.c
+++ b/drivers/leds/leds-pca995x.c
@@ -11,7 +11,6 @@
 #include <linux/i2c.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c
index ade64629431a..5ba0f36b2d81 100644
--- a/drivers/leds/leds-regulator.c
+++ b/drivers/leds/leds-regulator.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c
index d24d0ddf347c..0217557aad57 100644
--- a/drivers/leds/leds-spi-byte.c
+++ b/drivers/leds/leds-spi-byte.c
@@ -29,7 +29,6 @@
  */
 
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/leds/leds-sun50i-a100.c b/drivers/leds/leds-sun50i-a100.c
index 2c9bd360ab81..7cfb4c7390bf 100644
--- a/drivers/leds/leds-sun50i-a100.c
+++ b/drivers/leds/leds-sun50i-a100.c
@@ -15,7 +15,6 @@
 #include <linux/io.h>
 #include <linux/led-class-multicolor.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/leds/rgb/leds-group-multicolor.c b/drivers/leds/rgb/leds-group-multicolor.c
index 548c7dd63ba1..a707d51c6a4b 100644
--- a/drivers/leds/rgb/leds-group-multicolor.c
+++ b/drivers/leds/rgb/leds-group-multicolor.c
@@ -16,7 +16,6 @@
 #include <linux/led-class-multicolor.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
diff --git a/drivers/leds/rgb/leds-mt6370-rgb.c b/drivers/leds/rgb/leds-mt6370-rgb.c
index c5927d0eb830..2c0ccd1ba7fb 100644
--- a/drivers/leds/rgb/leds-mt6370-rgb.c
+++ b/drivers/leds/rgb/leds-mt6370-rgb.c
@@ -13,7 +13,6 @@
 #include <linux/leds.h>
 #include <linux/led-class-multicolor.h>
 #include <linux/linear_range.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/leds/rgb/leds-pwm-multicolor.c b/drivers/leds/rgb/leds-pwm-multicolor.c
index e0d7d3c9215c..d5b303aab5d6 100644
--- a/drivers/leds/rgb/leds-pwm-multicolor.c
+++ b/drivers/leds/rgb/leds-pwm-multicolor.c
@@ -9,7 +9,6 @@
 #include <linux/kernel.h>
 #include <linux/led-class-multicolor.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
index d5d9effece97..1702acc4773b 100644
--- a/drivers/mailbox/mailbox-mpfs.c
+++ b/drivers/mailbox/mailbox-mpfs.c
@@ -16,7 +16,6 @@
 #include <linux/regmap.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/mailbox_controller.h>
 #include <soc/microchip/mpfs.h>
diff --git a/drivers/mailbox/platform_mhu.c b/drivers/mailbox/platform_mhu.c
index 834aecd720ac..176ce290b8a8 100644
--- a/drivers/mailbox/platform_mhu.c
+++ b/drivers/mailbox/platform_mhu.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mailbox_controller.h>
diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
index ec1da9cd3674..1fe9c537671d 100644
--- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
+++ b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
@@ -8,7 +8,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/dmi.h>
 #include <linux/pci.h>
diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
index c348526a4c45..887d429668ed 100644
--- a/drivers/media/firewire/firedtv-fw.c
+++ b/drivers/media/firewire/firedtv-fw.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index e5d11a6e6766..a1c7f68225b4 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2013 Cogent Embedded, Inc.
  * Copyright (C) 2013 Renesas Solutions Corp.
  */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
diff --git a/drivers/media/i2c/cvs/core.c b/drivers/media/i2c/cvs/core.c
index 4282f33c7295..fe9e59ac311c 100644
--- a/drivers/media/i2c/cvs/core.c
+++ b/drivers/media/i2c/cvs/core.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
diff --git a/drivers/media/i2c/gc0308.c b/drivers/media/i2c/gc0308.c
index cbcda0e18ff1..15900d5414cf 100644
--- a/drivers/media/i2c/gc0308.c
+++ b/drivers/media/i2c/gc0308.c
@@ -10,7 +10,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/gc05a2.c b/drivers/media/i2c/gc05a2.c
index 8ba17f80fffe..7cf7cde1f936 100644
--- a/drivers/media/i2c/gc05a2.c
+++ b/drivers/media/i2c/gc05a2.c
@@ -15,7 +15,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/gc08a3.c b/drivers/media/i2c/gc08a3.c
index 11fd936db9c3..4144aad8f2da 100644
--- a/drivers/media/i2c/gc08a3.c
+++ b/drivers/media/i2c/gc08a3.c
@@ -15,7 +15,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c
index c3c90d830ee2..6b28a5fcd2da 100644
--- a/drivers/media/i2c/lm3560.c
+++ b/drivers/media/i2c/lm3560.c
@@ -15,7 +15,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c
index e395e2d14e97..848ea06e70ab 100644
--- a/drivers/media/i2c/mt9m114.c
+++ b/drivers/media/i2c/mt9m114.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index 8dc57eeba606..d21510caf45a 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -15,7 +15,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/property.h>
diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index d4359d5b92bb..5113826534d7 100644
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -14,7 +14,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c
index 78e63bd1b35b..5f1938c7a944 100644
--- a/drivers/media/i2c/ov2680.c
+++ b/drivers/media/i2c/ov2680.c
@@ -16,7 +16,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 92d2d6cd4ba4..8deb5f5501fa 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index 04b3183b7bcb..01fa892de079 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -6,7 +6,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/i2c/ov5675.c b/drivers/media/i2c/ov5675.c
index 508149485248..1c31b2a57eea 100644
--- a/drivers/media/i2c/ov5675.c
+++ b/drivers/media/i2c/ov5675.c
@@ -6,7 +6,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/ov64a40.c b/drivers/media/i2c/ov64a40.c
index 78b62c169b99..ed59b4818c55 100644
--- a/drivers/media/i2c/ov64a40.c
+++ b/drivers/media/i2c/ov64a40.c
@@ -10,7 +10,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
index 27afc3fc0175..311c61d9e25d 100644
--- a/drivers/media/i2c/ov7251.c
+++ b/drivers/media/i2c/ov7251.c
@@ -14,7 +14,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
index b6d238ba0d53..4d040e9feeac 100644
--- a/drivers/media/i2c/ov7670.c
+++ b/drivers/media/i2c/ov7670.c
@@ -10,7 +10,6 @@
  */
 #include <linux/clk.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c
index a8586df14f77..8c9cd769fa01 100644
--- a/drivers/media/i2c/ov8865.c
+++ b/drivers/media/i2c/ov8865.c
@@ -9,7 +9,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/i2c/t4ka3.c b/drivers/media/i2c/t4ka3.c
index 746548868bb0..a5a68e3fbec2 100644
--- a/drivers/media/i2c/t4ka3.c
+++ b/drivers/media/i2c/t4ka3.c
@@ -17,7 +17,6 @@
 #include <linux/errno.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index 376eecb0b673..99ace2acdb35 100644
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -18,7 +18,6 @@
 
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index 56b99eea54a1..6b50fb422a61 100644
--- a/drivers/media/i2c/video-i2c.c
+++ b/drivers/media/i2c/video-i2c.c
@@ -16,7 +16,6 @@
 #include <linux/kthread.h>
 #include <linux/i2c.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-core.c b/drivers/media/platform/arm/mali-c55/mali-c55-core.c
index ee4a4267415e..94a389b3f833 100644
--- a/drivers/media/platform/arm/mali-c55/mali-c55-core.c
+++ b/drivers/media/platform/arm/mali-c55/mali-c55-core.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
diff --git a/drivers/media/platform/chips-media/coda/imx-vdoa.c b/drivers/media/platform/chips-media/coda/imx-vdoa.c
index be874f18a365..cd085c1c73f4 100644
--- a/drivers/media/platform/chips-media/coda/imx-vdoa.c
+++ b/drivers/media/platform/chips-media/coda/imx-vdoa.c
@@ -10,7 +10,6 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/videodev2.h>
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
index b6f5b2249f1f..b312a15d707b 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
@@ -12,7 +12,6 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/platform/microchip/microchip-csi2dc.c b/drivers/media/platform/microchip/microchip-csi2dc.c
index 70303a0b6919..e69292f3b2a9 100644
--- a/drivers/media/platform/microchip/microchip-csi2dc.c
+++ b/drivers/media/platform/microchip/microchip-csi2dc.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/clk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index daa8f56610c7..6a43ea191da1 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -5,7 +5,6 @@
  */
 #include <linux/clk.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index bf53267cb68d..79acf7c1ec9a 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -5,7 +5,6 @@
  */
 #include <linux/clk.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
diff --git a/drivers/media/platform/renesas/rcar-fcp.c b/drivers/media/platform/renesas/rcar-fcp.c
index f90c86bbce6e..dfb0ca93e854 100644
--- a/drivers/media/platform/renesas/rcar-fcp.c
+++ b/drivers/media/platform/renesas/rcar-fcp.c
@@ -13,7 +13,6 @@
 #include <linux/iopoll.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
index 3c5fbd857371..798ef2916262 100644
--- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
+++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
@@ -12,7 +12,6 @@
 
 #include <linux/clk.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
diff --git a/drivers/media/platform/st/sti/hva/hva-v4l2.c b/drivers/media/platform/st/sti/hva/hva-v4l2.c
index 645e4f155dd0..33b768774e20 100644
--- a/drivers/media/platform/st/sti/hva/hva-v4l2.c
+++ b/drivers/media/platform/st/sti/hva/hva-v4l2.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <media/v4l2-event.h>
diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
index f4075576ef1d..65bc426e5aac 100644
--- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
+++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
index 12e438c678f9..7bff23d1ea98 100644
--- a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
+++ b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
@@ -9,7 +9,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/media/rc/ir-spi.c b/drivers/media/rc/ir-spi.c
index 392441e0c116..31eb58b06c70 100644
--- a/drivers/media/rc/ir-spi.c
+++ b/drivers/media/rc/ir-spi.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/memory/stm32_omm.c b/drivers/memory/stm32_omm.c
index 5d06623f3f68..0e891396bdb6 100644
--- a/drivers/memory/stm32_omm.c
+++ b/drivers/memory/stm32_omm.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
index f71265b303b9..2a4cb64c4c4c 100644
--- a/drivers/memory/tegra/tegra186-emc.c
+++ b/drivers/memory/tegra/tegra186-emc.c
@@ -6,7 +6,6 @@
 #include <linux/clk.h>
 #include <linux/debugfs.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
index 579d058da220..442edb2b033e 100644
--- a/drivers/memory/tegra/tegra186.c
+++ b/drivers/memory/tegra/tegra186.c
@@ -6,7 +6,6 @@
 #include <linux/io.h>
 #include <linux/iommu.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/memory/tegra/tegra210-emc-core.c b/drivers/memory/tegra/tegra210-emc-core.c
index 065ae8bc2830..e8d4cd8fdec2 100644
--- a/drivers/memory/tegra/tegra210-emc-core.c
+++ b/drivers/memory/tegra/tegra210-emc-core.c
@@ -9,7 +9,6 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mfd/adp5585.c b/drivers/mfd/adp5585.c
index 46b3ce3d7bae..aad1d734baeb 100644
--- a/drivers/mfd/adp5585.c
+++ b/drivers/mfd/adp5585.c
@@ -15,7 +15,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/mfd/adp5585.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c
index 0b541c0d3b1b..2a3a05122176 100644
--- a/drivers/mfd/atmel-hlcdc.c
+++ b/drivers/mfd/atmel-hlcdc.c
@@ -11,7 +11,6 @@
 #include <linux/mfd/atmel-hlcdc.h>
 #include <linux/mfd/core.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/mfd/atmel-smc.c b/drivers/mfd/atmel-smc.c
index 0a5b42c83f17..e69be61511a4 100644
--- a/drivers/mfd/atmel-smc.c
+++ b/drivers/mfd/atmel-smc.c
@@ -11,7 +11,6 @@
 #include <linux/bits.h>
 #include <linux/err.h>
 #include <linux/export.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/string.h>
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 11ee1146cf71..e253c753beb6 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -10,7 +10,6 @@
 #include <linux/kconfig.h>
 #include <linux/mfd/core.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/cros_ec_chardev.h>
diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c
index 0a0ab5e549a5..44ad63129b3f 100644
--- a/drivers/mfd/cs42l43-i2c.c
+++ b/drivers/mfd/cs42l43-i2c.c
@@ -11,7 +11,6 @@
 #include <linux/i2c.h>
 #include <linux/mfd/cs42l43.h>
 #include <linux/mfd/cs42l43-regs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/mfd/cs42l43-sdw.c b/drivers/mfd/cs42l43-sdw.c
index 794c98378175..1804b942bdb5 100644
--- a/drivers/mfd/cs42l43-sdw.c
+++ b/drivers/mfd/cs42l43-sdw.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/mfd/cs42l43.h>
 #include <linux/mfd/cs42l43-regs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c
index 3b4ffcbbee20..5cb392892c19 100644
--- a/drivers/mfd/hi655x-pmic.c
+++ b/drivers/mfd/hi655x-pmic.c
@@ -16,7 +16,6 @@
 #include <linux/mfd/hi655x-pmic.h>
 #include <linux/module.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 63406026d809..d4b24a717848 100644
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/gfp_types.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
index f7c592dd7e87..63a3fb58566e 100644
--- a/drivers/mfd/intel-lpss-pci.c
+++ b/drivers/mfd/intel-lpss-pci.c
@@ -10,7 +10,6 @@
 
 #include <linux/device.h>
 #include <linux/gfp_types.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
index 9d89171d83f9..117517c171b5 100644
--- a/drivers/mfd/intel_soc_pmic_bxtwc.c
+++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
@@ -19,7 +19,6 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/intel_soc_pmic.h>
 #include <linux/mfd/intel_soc_pmic_bxtwc.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/x86/intel_scu_ipc.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
index 41429f9bcb69..627a89334908 100644
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel_soc_pmic_crc.c
@@ -10,7 +10,6 @@
 
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/intel_soc_pmic.h>
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index c2008d2dc95a..b64729918dfd 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -10,7 +10,6 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/kempld.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/dmi.h>
diff --git a/drivers/mfd/lochnagar-i2c.c b/drivers/mfd/lochnagar-i2c.c
index 6c930c57f2e2..9d60a42745fc 100644
--- a/drivers/mfd/lochnagar-i2c.c
+++ b/drivers/mfd/lochnagar-i2c.c
@@ -15,7 +15,6 @@
 #include <linux/i2c.h>
 #include <linux/lockdep.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of_platform.h>
 #include <linux/regmap.h>
diff --git a/drivers/mfd/lp873x.c b/drivers/mfd/lp873x.c
index e8c5c89c2a76..3bb38e2f2a5a 100644
--- a/drivers/mfd/lp873x.c
+++ b/drivers/mfd/lp873x.c
@@ -7,7 +7,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c
index 9488d3793c10..b78ae79df5fa 100644
--- a/drivers/mfd/lp87565.c
+++ b/drivers/mfd/lp87565.c
@@ -9,7 +9,6 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index 7e7e8af9af22..da275a04a1ef 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -10,7 +10,6 @@
 
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
diff --git a/drivers/mfd/max7360.c b/drivers/mfd/max7360.c
index 5ee459c490ec..52fffed0c0dd 100644
--- a/drivers/mfd/max7360.c
+++ b/drivers/mfd/max7360.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/max7360.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
diff --git a/drivers/mfd/max77759.c b/drivers/mfd/max77759.c
index b50433e7b3d3..72b608a1ab3f 100644
--- a/drivers/mfd/max77759.c
+++ b/drivers/mfd/max77759.c
@@ -21,7 +21,6 @@
 #include <linux/jiffies.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/max77759.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
index fcff0c498c0f..2a48577b1a79 100644
--- a/drivers/mfd/max77843.c
+++ b/drivers/mfd/max77843.c
@@ -13,7 +13,6 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/max77693-common.h>
 #include <linux/mfd/max77843-private.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 static const struct mfd_cell max77843_devs[] = {
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 9f438d5d4326..56d2e57b7d73 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/slab.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
index d8243b956f87..feeccb2c6655 100644
--- a/drivers/mfd/motorola-cpcap.c
+++ b/drivers/mfd/motorola-cpcap.c
@@ -11,7 +11,6 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/sysfs.h>
 
diff --git a/drivers/mfd/ocelot-spi.c b/drivers/mfd/ocelot-spi.c
index 1fed9878c323..fc30663824bb 100644
--- a/drivers/mfd/ocelot-spi.c
+++ b/drivers/mfd/ocelot-spi.c
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/export.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c
index 2204bf1c5a51..99610465005f 100644
--- a/drivers/mfd/rt5033.c
+++ b/drivers/mfd/rt5033.c
@@ -10,7 +10,8 @@
  */
 
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
+#include <linux/mod_device_id/i2c.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
diff --git a/drivers/mfd/rt5120.c b/drivers/mfd/rt5120.c
index 58d9a124d795..a229eb292484 100644
--- a/drivers/mfd/rt5120.c
+++ b/drivers/mfd/rt5120.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/mfd/core.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 
 #define RT5120_REG_INTENABLE	0x1D
diff --git a/drivers/mfd/rz-mtu3.c b/drivers/mfd/rz-mtu3.c
index 3fa7dfe71386..0a254e61ec0a 100644
--- a/drivers/mfd/rz-mtu3.c
+++ b/drivers/mfd/rz-mtu3.c
@@ -12,7 +12,6 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/rz-mtu3.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
 #include <linux/spinlock.h>
diff --git a/drivers/mfd/sec-acpm.c b/drivers/mfd/sec-acpm.c
index 3397d13d3b7f..d11fbf5b94b7 100644
--- a/drivers/mfd/sec-acpm.c
+++ b/drivers/mfd/sec-acpm.c
@@ -14,7 +14,6 @@
 #include <linux/mfd/samsung/rtc.h>
 #include <linux/mfd/samsung/s2mpg10.h>
 #include <linux/mfd/samsung/s2mpg11.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index d8609886fcc8..4eec8f7ceee3 100644
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -19,7 +19,6 @@
 #include <linux/mfd/samsung/s2mpu02.h>
 #include <linux/mfd/samsung/s2mu005.h>
 #include <linux/mfd/samsung/s5m8767.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/property.h>
diff --git a/drivers/mfd/simple-mfd-i2c.c b/drivers/mfd/simple-mfd-i2c.c
index 52c81b18750e..ef3ce4bdf98b 100644
--- a/drivers/mfd/simple-mfd-i2c.c
+++ b/drivers/mfd/simple-mfd-i2c.c
@@ -20,7 +20,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c
index 7ff7516286fd..d2269f14f068 100644
--- a/drivers/mfd/tps6594-i2c.c
+++ b/drivers/mfd/tps6594-i2c.c
@@ -13,7 +13,6 @@
 #include <linux/crc8.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c
index 944b7313a1d9..bb95d6b64cb4 100644
--- a/drivers/mfd/tps6594-spi.c
+++ b/drivers/mfd/tps6594-spi.c
@@ -12,7 +12,6 @@
 
 #include <linux/crc8.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/mfd/upboard-fpga.c b/drivers/mfd/upboard-fpga.c
index afce623bbba5..9a9599dcb0a1 100644
--- a/drivers/mfd/upboard-fpga.c
+++ b/drivers/mfd/upboard-fpga.c
@@ -18,7 +18,6 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/upboard-fpga.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index e7e68929275e..0e3224f80321 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -15,7 +15,7 @@
 #include <linux/mfd/core.h>
 #include <linux/slab.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/pdata.h>
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 5d5f357a1996..772c4d9fa651 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/nvmem-provider.h>
diff --git a/drivers/misc/eeprom/ee1004.c b/drivers/misc/eeprom/ee1004.c
index e13f9fdd9d7b..923f404a44c0 100644
--- a/drivers/misc/eeprom/ee1004.c
+++ b/drivers/misc/eeprom/ee1004.c
@@ -13,7 +13,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/nvmem-provider.h>
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index 5230e910a1d1..f9c3ab52c2f9 100644
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -12,7 +12,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/kstrtox.h>
 #include <linux/log2.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
index 60c42170d147..e056d2dea8c3 100644
--- a/drivers/misc/eeprom/idt_89hpesx.c
+++ b/drivers/misc/eeprom/idt_89hpesx.c
@@ -45,7 +45,6 @@
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 #include <linux/debugfs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/i2c.h>
 #include <linux/pci_ids.h>
diff --git a/drivers/misc/hisi_hikey_usb.c b/drivers/misc/hisi_hikey_usb.c
index 2c6e448a47f1..79f06001259b 100644
--- a/drivers/misc/hisi_hikey_usb.c
+++ b/drivers/misc/hisi_hikey_usb.c
@@ -11,7 +11,6 @@
 
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/platform_device.h>
diff --git a/drivers/misc/pvpanic/pvpanic-mmio.c b/drivers/misc/pvpanic/pvpanic-mmio.c
index f3f2113a54a7..bedcda9b6ac5 100644
--- a/drivers/misc/pvpanic/pvpanic-mmio.c
+++ b/drivers/misc/pvpanic/pvpanic-mmio.c
@@ -12,7 +12,6 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/kexec.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
diff --git a/drivers/misc/pvpanic/pvpanic.c b/drivers/misc/pvpanic/pvpanic.c
index 17c0eb549463..b57d773f6876 100644
--- a/drivers/misc/pvpanic/pvpanic.c
+++ b/drivers/misc/pvpanic/pvpanic.c
@@ -15,7 +15,6 @@
 #include <linux/kstrtox.h>
 #include <linux/limits.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/panic_notifier.h>
 #include <linux/platform_device.h>
diff --git a/drivers/misc/smpro-errmon.c b/drivers/misc/smpro-errmon.c
index c12035a46585..56952fd96cb8 100644
--- a/drivers/misc/smpro-errmon.c
+++ b/drivers/misc/smpro-errmon.c
@@ -6,7 +6,6 @@
  *
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/misc/smpro-misc.c b/drivers/misc/smpro-misc.c
index 6c427141e51b..2ca5e3bcc215 100644
--- a/drivers/misc/smpro-misc.c
+++ b/drivers/misc/smpro-misc.c
@@ -4,7 +4,6 @@
  *
  * Copyright (c) 2022, Ampere Computing LLC
  */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/mmc/host/litex_mmc.c b/drivers/mmc/host/litex_mmc.c
index 3655542ca998..06a6f24702e0 100644
--- a/drivers/mmc/host/litex_mmc.c
+++ b/drivers/mmc/host/litex_mmc.c
@@ -17,7 +17,6 @@
 #include <linux/iopoll.h>
 #include <linux/litex.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
index dc585726b66e..349082d76a99 100644
--- a/drivers/mmc/host/owl-mmc.c
+++ b/drivers/mmc/host/owl-mmc.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/slot-gpio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 024edc4e5fe6..0c3967f758c2 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -12,7 +12,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/io-64-nonatomic-hi-lo.h>
 #include <linux/mmc/host.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pagemap.h>
diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
index 9215600f03a2..426308b73b49 100644
--- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
@@ -12,7 +12,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/mmc/host.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pagemap.h>
diff --git a/drivers/mmc/host/sdhci-npcm.c b/drivers/mmc/host/sdhci-npcm.c
index 71b635dfdf1d..72976cd9b121 100644
--- a/drivers/mmc/host/sdhci-npcm.c
+++ b/drivers/mmc/host/sdhci-npcm.c
@@ -10,7 +10,6 @@
 #include <linux/io.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 
diff --git a/drivers/mmc/host/sdhci-of-ma35d1.c b/drivers/mmc/host/sdhci-of-ma35d1.c
index 287026422616..a3b676894838 100644
--- a/drivers/mmc/host/sdhci-of-ma35d1.c
+++ b/drivers/mmc/host/sdhci-of-ma35d1.c
@@ -20,7 +20,6 @@
 #include <linux/minmax.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index bf899c8e38f5..9831956de1c8 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -44,7 +44,6 @@
 #include <linux/mmc/mmc.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/slot-gpio.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/pagemap.h>
 #include <linux/platform_data/sh_mmcif.h>
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 8dbcff53a631..fe4c0f6d73f3 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -26,7 +26,6 @@
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/slot-gpio.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
index 950923d977b7..8ed64613fda5 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
@@ -5,7 +5,6 @@
 
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mux/adgs1408.c b/drivers/mux/adgs1408.c
index 5eaf07d09ac9..af63862996d0 100644
--- a/drivers/mux/adgs1408.c
+++ b/drivers/mux/adgs1408.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mux/driver.h>
 #include <linux/property.h>
diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
index 4cc3202c58f3..f9c7863e51b8 100644
--- a/drivers/mux/gpio.c
+++ b/drivers/mux/gpio.c
@@ -10,7 +10,6 @@
 #include <linux/bitmap.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mux/driver.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c
index 91b1fa970f8f..ae90e6716de5 100644
--- a/drivers/net/can/spi/hi311x.c
+++ b/drivers/net/can/spi/hi311x.c
@@ -25,7 +25,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index 92a86083c896..f441f2265299 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -16,7 +16,6 @@
 #include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c
index ba08d2cf8e99..fa32541cc52c 100644
--- a/drivers/net/dsa/microchip/ksz8863_smi.c
+++ b/drivers/net/dsa/microchip/ksz8863_smi.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 Pengutronix, Michael Grzeschik <kernel@pengutronix.de>
  */
 
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/property.h>
 
 #include "ksz8.h"
diff --git a/drivers/net/dsa/mt7530-mmio.c b/drivers/net/dsa/mt7530-mmio.c
index 1dc8b93fb51a..119fdd863d91 100644
--- a/drivers/net/dsa/mt7530-mmio.c
+++ b/drivers/net/dsa/mt7530-mmio.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index eb3944ba2a72..962cf4653c36 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -8,7 +8,6 @@
 #include <soc/mscc/ocelot_sys.h>
 #include <soc/mscc/ocelot.h>
 #include <linux/mdio/mdio-mscc-miim.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_mdio.h>
 #include <linux/pcs-lynx.h>
 #include <linux/dsa/ocelot.h>
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index ef5174eb01ec..a2410fba6be2 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -3,7 +3,6 @@
  * Copyright 2010-2011 Calxeda, Inc.
  */
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/circ_buf.h>
 #include <linux/interrupt.h>
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index 5cb478e98697..6d4fbadc7dcf 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -6,7 +6,6 @@
 #include <linux/module.h>
 #include <linux/etherdevice.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_net.h>
 #include <linux/platform_device.h>
 #include "nps_enet.h"
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index 5803a382f0ba..40ba001d4b3f 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -18,7 +18,6 @@
 #include <linux/io.h>
 #include <linux/mii.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 3edc8d142dd5..ad2d8256eb8d 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -7,7 +7,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_mdio.h>
 #include <linux/of_net.h>
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ierb.c b/drivers/net/ethernet/freescale/enetc/enetc_ierb.c
index d39617ab9306..f0600b97a3d6 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ierb.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ierb.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index 09f6373ed2f9..ed07532aaf85 100644
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -14,7 +14,6 @@
  *
  * Copyright (c) 2005 Eugene Surovegin <ebs@ebshome.net>
  */
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/net/ethernet/ibm/emac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
index 69ca6065de1c..a3839cf02ec4 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.c
+++ b/drivers/net/ethernet/ibm/emac/zmii.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
index 3f4447e68888..2ccb8c8f5feb 100644
--- a/drivers/net/ethernet/marvell/mvmdio.c
+++ b/drivers/net/ethernet/marvell/mvmdio.c
@@ -25,7 +25,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_mdio.h>
 #include <linux/phy.h>
diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
index 654190263535..02c3c2204f18 100644
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
@@ -16,7 +16,6 @@
 #include <linux/irqreturn.h>
 #include <linux/jiffies.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/phy.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/drivers/net/ethernet/mellanox/mlxsw/i2c.c
index f9f565c1036d..60a50222f33a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/i2c.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/i2c.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_data/mlxreg.h>
 #include <linux/slab.h>
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index 1fee57054b20..80f1b8d7b326 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -7,7 +7,6 @@
 #include <linux/i2c.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 
 #include "core.h"
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
index 2ab6ecac6422..b027cdf6afc2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_net.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
index 44d4ceb8415f..e02ad3762b5f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/property.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "stmmac_platform.h"
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c
index 223754cc5c79..6081c8c7acbe 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c
@@ -7,7 +7,6 @@
 
 #include <linux/clk.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mfd/syscon.h>
 #include <linux/of.h>
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
index b1ea248e3311..4ee5b5fe1fa7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
@@ -7,7 +7,6 @@
  *
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/mfd/syscon.h>
diff --git a/drivers/net/ethernet/xscale/ptp_ixp46x.c b/drivers/net/ethernet/xscale/ptp_ixp46x.c
index 93c64db22a69..558c4f8d23f7 100644
--- a/drivers/net/ethernet/xscale/ptp_ixp46x.c
+++ b/drivers/net/ethernet/xscale/ptp_ixp46x.c
@@ -6,7 +6,6 @@
  */
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index d3f42efc5d1a..05a65a9659ad 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -8,7 +8,6 @@
 
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/ieee802154.h>
diff --git a/drivers/net/mdio/mdio-realtek-rtl9300.c b/drivers/net/mdio/mdio-realtek-rtl9300.c
index 892ed3780a65..afd52a1cd7f8 100644
--- a/drivers/net/mdio/mdio-realtek-rtl9300.c
+++ b/drivers/net/mdio/mdio-realtek-rtl9300.c
@@ -43,7 +43,6 @@
 #include <linux/find.h>
 #include <linux/mdio.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of_mdio.h>
 #include <linux/phy.h>
diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c
index ae169929a9d8..5eb6b461f50b 100644
--- a/drivers/net/mhi_net.c
+++ b/drivers/net/mhi_net.c
@@ -6,7 +6,6 @@
 
 #include <linux/if_arp.h>
 #include <linux/mhi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/wan/fsl_qmc_hdlc.c b/drivers/net/wan/fsl_qmc_hdlc.c
index 8976dea8e17e..e74f87940c4f 100644
--- a/drivers/net/wan/fsl_qmc_hdlc.c
+++ b/drivers/net/wan/fsl_qmc_hdlc.c
@@ -16,7 +16,6 @@
 #include <linux/err.h>
 #include <linux/framer/framer.h>
 #include <linux/hdlc.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 802e6596a6a8..a7d0415b2a0e 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nl80211.h>
 #include <linux/of.h>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
index abe7f6501e5e..1eb69bd33a75 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/dmi.h>
-#include <linux/mod_devicetable.h>
 #include "core.h"
 #include "common.h"
 #include "brcm_hw_ids.h"
diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c
index d18be2545028..ecb545793d63 100644
--- a/drivers/net/wireless/intersil/p54/p54spi.c
+++ b/drivers/net/wireless/intersil/p54/p54spi.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 8fdc7430c008..26a0e67de302 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -8,7 +8,6 @@
  */
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index 30a1da72eb08..920864948197 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <linux/err.h>
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 4be1110bac88..d087d9c72f91 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/ip.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wwan/mhi_wwan_ctrl.c b/drivers/net/wwan/mhi_wwan_ctrl.c
index fa73861db6ad..a31d8540fbb8 100644
--- a/drivers/net/wwan/mhi_wwan_ctrl.c
+++ b/drivers/net/wwan/mhi_wwan_ctrl.c
@@ -2,7 +2,6 @@
 /* Copyright (c) 2021, Linaro Ltd <loic.poulain@linaro.org> */
 #include <linux/kernel.h>
 #include <linux/mhi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/wwan.h>
 
diff --git a/drivers/net/wwan/mhi_wwan_mbim.c b/drivers/net/wwan/mhi_wwan_mbim.c
index 1d7e3ad900c1..a94998712597 100644
--- a/drivers/net/wwan/mhi_wwan_mbim.c
+++ b/drivers/net/wwan/mhi_wwan_mbim.c
@@ -17,7 +17,6 @@
 #include <linux/ip.h>
 #include <linux/mhi.h>
 #include <linux/mii.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/wwan/qcom_bam_dmux.c b/drivers/net/wwan/qcom_bam_dmux.c
index 6a5b22589af4..cc6ace8d6437 100644
--- a/drivers/net/wwan/qcom_bam_dmux.c
+++ b/drivers/net/wwan/qcom_bam_dmux.c
@@ -11,7 +11,6 @@
 #include <linux/dmaengine.h>
 #include <linux/if_arp.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
diff --git a/drivers/net/wwan/rpmsg_wwan_ctrl.c b/drivers/net/wwan/rpmsg_wwan_ctrl.c
index 26756ff0e44d..ba17b5ae6bdb 100644
--- a/drivers/net/wwan/rpmsg_wwan_ctrl.c
+++ b/drivers/net/wwan/rpmsg_wwan_ctrl.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2021, Stephan Gerhold <stephan@gerhold.net> */
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rpmsg.h>
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index e2a77a5fc887..c256ae92d6b1 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -8,7 +8,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nfc.h>
 #include <net/nfc/llc.h>
 
diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c
index c493f2dbd0e2..3d3755cfa71e 100644
--- a/drivers/nfc/pn544/mei.c
+++ b/drivers/nfc/pn544/mei.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nfc.h>
 #include <net/nfc/hci.h>
 #include <net/nfc/llc.h>
diff --git a/drivers/nfc/s3fwrn5/uart.c b/drivers/nfc/s3fwrn5/uart.c
index 540a4ddb0b05..e17c599a2da5 100644
--- a/drivers/nfc/s3fwrn5/uart.c
+++ b/drivers/nfc/s3fwrn5/uart.c
@@ -10,7 +10,6 @@
 
 #include <linux/device.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nfc.h>
 #include <linux/netdevice.h>
diff --git a/drivers/nvmem/an8855-efuse.c b/drivers/nvmem/an8855-efuse.c
index d1afde6f623f..ed0840f7954f 100644
--- a/drivers/nvmem/an8855-efuse.c
+++ b/drivers/nvmem/an8855-efuse.c
@@ -3,7 +3,6 @@
  *  Airoha AN8855 Switch EFUSE Driver
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
diff --git a/drivers/nvmem/apple-efuses.c b/drivers/nvmem/apple-efuses.c
index 1d1bf84a099f..9913e77b8ff0 100644
--- a/drivers/nvmem/apple-efuses.c
+++ b/drivers/nvmem/apple-efuses.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c
index 2dce6a7b8039..aaa6537798bf 100644
--- a/drivers/nvmem/brcm_nvram.c
+++ b/drivers/nvmem/brcm_nvram.c
@@ -8,7 +8,6 @@
 #include <linux/hex.h>
 #include <linux/if_ether.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nvmem-consumer.h>
 #include <linux/nvmem-provider.h>
diff --git a/drivers/nvmem/layerscape-sfp.c b/drivers/nvmem/layerscape-sfp.c
index e2b424561949..c1521afd5b43 100644
--- a/drivers/nvmem/layerscape-sfp.c
+++ b/drivers/nvmem/layerscape-sfp.c
@@ -8,7 +8,6 @@
 
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
diff --git a/drivers/nvmem/lpc18xx_eeprom.c b/drivers/nvmem/lpc18xx_eeprom.c
index aa43f5f612f9..504155e30bab 100644
--- a/drivers/nvmem/lpc18xx_eeprom.c
+++ b/drivers/nvmem/lpc18xx_eeprom.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
diff --git a/drivers/nvmem/max77759-nvmem.c b/drivers/nvmem/max77759-nvmem.c
index c9961ad0e232..283000ec3a2c 100644
--- a/drivers/nvmem/max77759-nvmem.c
+++ b/drivers/nvmem/max77759-nvmem.c
@@ -10,7 +10,6 @@
 #include <linux/device/driver.h>
 #include <linux/err.h>
 #include <linux/mfd/max77759.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nvmem-provider.h>
 #include <linux/overflow.h>
diff --git a/drivers/nvmem/mtk-efuse.c b/drivers/nvmem/mtk-efuse.c
index af953e1d9230..00a84ea963a8 100644
--- a/drivers/nvmem/mtk-efuse.c
+++ b/drivers/nvmem/mtk-efuse.c
@@ -6,7 +6,6 @@
 
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/io.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
diff --git a/drivers/nvmem/nintendo-otp.c b/drivers/nvmem/nintendo-otp.c
index 355e7f1fc6d5..4440d4e5fb83 100644
--- a/drivers/nvmem/nintendo-otp.c
+++ b/drivers/nvmem/nintendo-otp.c
@@ -15,7 +15,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index a872c640b8c5..1de3435df116 100644
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -9,7 +9,6 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
diff --git a/drivers/nvmem/qoriq-efuse.c b/drivers/nvmem/qoriq-efuse.c
index e7fd04d6dd94..80f514939ae6 100644
--- a/drivers/nvmem/qoriq-efuse.c
+++ b/drivers/nvmem/qoriq-efuse.c
@@ -6,7 +6,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/nvmem/rcar-efuse.c b/drivers/nvmem/rcar-efuse.c
index d9a96a1d59c8..b94ff83b7df3 100644
--- a/drivers/nvmem/rcar-efuse.c
+++ b/drivers/nvmem/rcar-efuse.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/export.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/nvmem/sec-qfprom.c b/drivers/nvmem/sec-qfprom.c
index 19799b3fe00a..51d21e65a543 100644
--- a/drivers/nvmem/sec-qfprom.c
+++ b/drivers/nvmem/sec-qfprom.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/firmware/qcom/qcom_scm.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/nvmem/sunplus-ocotp.c b/drivers/nvmem/sunplus-ocotp.c
index 30d55b111a64..6884def3ba5f 100644
--- a/drivers/nvmem/sunplus-ocotp.c
+++ b/drivers/nvmem/sunplus-ocotp.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/nvmem/u-boot-env.c b/drivers/nvmem/u-boot-env.c
index ced414fc9e60..467b288918db 100644
--- a/drivers/nvmem/u-boot-env.c
+++ b/drivers/nvmem/u-boot-env.c
@@ -3,7 +3,6 @@
  * Copyright (C) 2022 Rafał Miłecki <rafal@milecki.pl>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
 #include <linux/nvmem-provider.h>
diff --git a/drivers/nvmem/uniphier-efuse.c b/drivers/nvmem/uniphier-efuse.c
index 6ad3295d3195..85f9372fb97c 100644
--- a/drivers/nvmem/uniphier-efuse.c
+++ b/drivers/nvmem/uniphier-efuse.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/of/device.c b/drivers/of/device.c
index be4e1584e0af..b3dc78f2fa3a 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -8,7 +8,6 @@
 #include <linux/dma-direct.h> /* for bus_dma_region */
 #include <linux/dma-map-ops.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pci/controller/cadence/pcie-sg2042.c b/drivers/pci/controller/cadence/pcie-sg2042.c
index 4a2af4d0713e..265246aa18fd 100644
--- a/drivers/pci/controller/cadence/pcie-sg2042.c
+++ b/drivers/pci/controller/cadence/pcie-sg2042.c
@@ -6,7 +6,6 @@
  * Copyright (C) 2025 Chen Wang <unicorn_wang@outlook.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c
index 0bb7d4f5d784..e3c05ade381b 100644
--- a/drivers/pci/controller/dwc/pci-exynos.c
+++ b/drivers/pci/controller/dwc/pci-exynos.c
@@ -18,7 +18,6 @@
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pcie-designware.h"
diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
index 0694084f612b..515eced3c7ae 100644
--- a/drivers/pci/controller/dwc/pci-meson.c
+++ b/drivers/pci/controller/dwc/pci-meson.c
@@ -15,7 +15,6 @@
 #include <linux/resource.h>
 #include <linux/types.h>
 #include <linux/phy/phy.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "pcie-designware.h"
diff --git a/drivers/pci/controller/dwc/pcie-intel-gw.c b/drivers/pci/controller/dwc/pcie-intel-gw.c
index c21906eced61..649e60d41522 100644
--- a/drivers/pci/controller/dwc/pcie-intel-gw.c
+++ b/drivers/pci/controller/dwc/pcie-intel-gw.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/gpio/consumer.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pci_regs.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
index 7cf2c312ecec..474909e888e0 100644
--- a/drivers/pci/controller/dwc/pcie-keembay.c
+++ b/drivers/pci/controller/dwc/pcie-keembay.c
@@ -14,7 +14,6 @@
 #include <linux/iopoll.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pci/controller/dwc/pcie-spacemit-k1.c b/drivers/pci/controller/dwc/pcie-spacemit-k1.c
index be20a520255b..04241df8fd59 100644
--- a/drivers/pci/controller/dwc/pcie-spacemit-k1.c
+++ b/drivers/pci/controller/dwc/pcie-spacemit-k1.c
@@ -12,7 +12,6 @@
 #include <linux/err.h>
 #include <linux/gfp.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/pci/controller/dwc/pcie-stm32.c b/drivers/pci/controller/dwc/pcie-stm32.c
index a9e77478443b..349618ea5b9c 100644
--- a/drivers/pci/controller/dwc/pcie-stm32.c
+++ b/drivers/pci/controller/dwc/pcie-stm32.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/irq.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/pci/pwrctrl/generic.c b/drivers/pci/pwrctrl/generic.c
index 1ae19450a455..a7e599d841e6 100644
--- a/drivers/pci/pwrctrl/generic.c
+++ b/drivers/pci/pwrctrl/generic.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/pci-pwrctrl.h>
diff --git a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
index c7e4beec160a..a308bf4b5fc0 100644
--- a/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
+++ b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci-pwrctrl.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c b/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c
index 488e1ec34a7f..1555e8a9b3ca 100644
--- a/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c
+++ b/drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c
@@ -10,7 +10,6 @@
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 8af3563fdf60..c18a0e3205ab 100644
--- a/drivers/perf/arm-ccn.c
+++ b/drivers/perf/arm-ccn.c
@@ -10,7 +10,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/perf_event.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/perf/fujitsu_uncore_pmu.c b/drivers/perf/fujitsu_uncore_pmu.c
index c3c6f56474ad..aeeb68c66e1e 100644
--- a/drivers/perf/fujitsu_uncore_pmu.c
+++ b/drivers/perf/fujitsu_uncore_pmu.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/perf_event.h>
 #include <linux/platform_device.h>
diff --git a/drivers/perf/hisilicon/hisi_uncore_mn_pmu.c b/drivers/perf/hisilicon/hisi_uncore_mn_pmu.c
index 4df4eebe243e..246cc0333099 100644
--- a/drivers/perf/hisilicon/hisi_uncore_mn_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_mn_pmu.c
@@ -9,7 +9,6 @@
 #include <linux/iopoll.h>
 #include <linux/irq.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #include "hisi_uncore_pmu.h"
diff --git a/drivers/perf/hisilicon/hisi_uncore_noc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_noc_pmu.c
index de3b9cc7aada..616f4af57db7 100644
--- a/drivers/perf/hisilicon/hisi_uncore_noc_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_noc_pmu.c
@@ -9,7 +9,6 @@
 #include <linux/cpuhotplug.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
index 03cb9b564b99..e8186b6e1687 100644
--- a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
@@ -10,7 +10,6 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 
 #include "hisi_uncore_pmu.h"
 
diff --git a/drivers/perf/riscv_pmu_legacy.c b/drivers/perf/riscv_pmu_legacy.c
index 93c8e0fdb589..4d6461d6a74f 100644
--- a/drivers/perf/riscv_pmu_legacy.c
+++ b/drivers/perf/riscv_pmu_legacy.c
@@ -8,7 +8,6 @@
  * which are in turn based on sparc64 and x86 code.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/perf/riscv_pmu.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index 385af5e6e6d0..dfc886dee5ad 100644
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -10,7 +10,6 @@
 
 #define pr_fmt(fmt) "riscv-pmu-sbi: " fmt
 
-#include <linux/mod_devicetable.h>
 #include <linux/perf/riscv_pmu.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
diff --git a/drivers/perf/starfive_starlink_pmu.c b/drivers/perf/starfive_starlink_pmu.c
index 964897c2baa9..b1c7dc4869bd 100644
--- a/drivers/perf/starfive_starlink_pmu.c
+++ b/drivers/perf/starfive_starlink_pmu.c
@@ -17,7 +17,6 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/perf_event.h>
 #include <linux/platform_device.h>
 #include <linux/sysfs.h>
diff --git a/drivers/phy/allwinner/phy-sun50i-usb3.c b/drivers/phy/allwinner/phy-sun50i-usb3.c
index 363f9a0df503..84055b720016 100644
--- a/drivers/phy/allwinner/phy-sun50i-usb3.c
+++ b/drivers/phy/allwinner/phy-sun50i-usb3.c
@@ -16,7 +16,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c b/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
index c4a56b9d3289..5e2b7d93bdb1 100644
--- a/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
+++ b/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
@@ -13,7 +13,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c
index 14dee73f9cb5..13668764655c 100644
--- a/drivers/phy/amlogic/phy-meson-axg-pcie.c
+++ b/drivers/phy/amlogic/phy-meson-axg-pcie.c
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2020 Remi Pommarel <repk@triplefau.lt>
  */
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/regmap.h>
diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c
index 6b390304f723..f6bc0ca248f7 100644
--- a/drivers/phy/amlogic/phy-meson-gxl-usb2.c
+++ b/drivers/phy/amlogic/phy-meson-gxl-usb2.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c
index a553231a9f7c..71e5e281f188 100644
--- a/drivers/phy/amlogic/phy-meson8b-usb2.c
+++ b/drivers/phy/amlogic/phy-meson8b-usb2.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/phy/cadence/cdns-dphy-rx.c b/drivers/phy/cadence/cdns-dphy-rx.c
index 3ac80141189c..469b8eaca94c 100644
--- a/drivers/phy/cadence/cdns-dphy-rx.c
+++ b/drivers/phy/cadence/cdns-dphy-rx.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/phy/phy-mipi-dphy.h>
diff --git a/drivers/phy/hisilicon/phy-hi3670-pcie.c b/drivers/phy/hisilicon/phy-hi3670-pcie.c
index dbc7dcce682b..7396c601d874 100644
--- a/drivers/phy/hisilicon/phy-hi3670-pcie.c
+++ b/drivers/phy/hisilicon/phy-hi3670-pcie.c
@@ -23,7 +23,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/phy/phy.h>
diff --git a/drivers/phy/hisilicon/phy-hi6220-usb.c b/drivers/phy/hisilicon/phy-hi6220-usb.c
index 22d8d8a8dabe..4e6ff3af381f 100644
--- a/drivers/phy/hisilicon/phy-hi6220-usb.c
+++ b/drivers/phy/hisilicon/phy-hi6220-usb.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
diff --git a/drivers/phy/intel/phy-intel-keembay-usb.c b/drivers/phy/intel/phy-intel-keembay-usb.c
index c8b05f7b2445..7c2192965f68 100644
--- a/drivers/phy/intel/phy-intel-keembay-usb.c
+++ b/drivers/phy/intel/phy-intel-keembay-usb.c
@@ -8,7 +8,6 @@
 #include <linux/bits.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/phy/marvell/phy-mmp3-hsic.c b/drivers/phy/marvell/phy-mmp3-hsic.c
index 72ab6da0ebc3..41bfa542b73e 100644
--- a/drivers/phy/marvell/phy-mmp3-hsic.c
+++ b/drivers/phy/marvell/phy-mmp3-hsic.c
@@ -5,7 +5,6 @@
 
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/phy/marvell/phy-mmp3-usb.c b/drivers/phy/marvell/phy-mmp3-usb.c
index 5b71deb08851..04c0bada3519 100644
--- a/drivers/phy/marvell/phy-mmp3-usb.c
+++ b/drivers/phy/marvell/phy-mmp3-usb.c
@@ -6,7 +6,6 @@
 
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/phy/marvell/phy-mvebu-sata.c b/drivers/phy/marvell/phy-mvebu-sata.c
index 89a5a2b69d80..51a4646e2933 100644
--- a/drivers/phy/marvell/phy-mvebu-sata.c
+++ b/drivers/phy/marvell/phy-mvebu-sata.c
@@ -10,7 +10,6 @@
 #include <linux/clk.h>
 #include <linux/phy/phy.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 struct priv {
diff --git a/drivers/phy/mediatek/phy-mtk-ufs.c b/drivers/phy/mediatek/phy-mtk-ufs.c
index 0cb5a25b1b7a..fc19e0fa8ed5 100644
--- a/drivers/phy/mediatek/phy-mtk-ufs.c
+++ b/drivers/phy/mediatek/phy-mtk-ufs.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c
index f90bf7e95463..af4fa17ac6cb 100644
--- a/drivers/phy/phy-snps-eusb2.c
+++ b/drivers/phy/phy-snps-eusb2.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
diff --git a/drivers/phy/qualcomm/phy-ath79-usb.c b/drivers/phy/qualcomm/phy-ath79-usb.c
index f8d0199c6e78..09a77e556ece 100644
--- a/drivers/phy/qualcomm/phy-ath79-usb.c
+++ b/drivers/phy/qualcomm/phy-ath79-usb.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2015-2018 Alban Bedel <albeu@free.fr>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c
index 0f69060aa5d5..cbd780556da8 100644
--- a/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c
index fba35510d88c..f68de14366db 100644
--- a/drivers/phy/rockchip/phy-rockchip-usbdp.c
+++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c
@@ -13,7 +13,6 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/phy/phy.h>
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
index f9d8fb1ab1ec..6c218ce3396d 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
@@ -6,7 +6,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index 50979787db5c..b0cba0f3e17e 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -7,7 +7,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
index 8cf61aab81b1..85d6640ff4c4 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
@@ -4,7 +4,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm4908.c b/drivers/pinctrl/bcm/pinctrl-bcm4908.c
index 57969cdbc635..709ef4add927 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm4908.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm4908.c
@@ -3,7 +3,6 @@
 
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm63xx.c b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c
index 59d2ce8462d8..a4aa4146b530 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm63xx.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c
@@ -8,7 +8,6 @@
 
 #include <linux/gpio/regmap.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx-scmi.c b/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
index e14bdbc7bea7..613552e35070 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/scmi_protocol.h>
 #include <linux/seq_file.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-imx23.c b/drivers/pinctrl/freescale/pinctrl-imx23.c
index 0404efbf2a86..7655c1a0cd66 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx23.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx23.c
@@ -6,7 +6,6 @@
 // Copyright 2012 Freescale Semiconductor, Inc.
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 #include "pinctrl-mxs.h"
diff --git a/drivers/pinctrl/freescale/pinctrl-imx25.c b/drivers/pinctrl/freescale/pinctrl-imx25.c
index d2b0b6aad306..e1604c3bdcec 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx25.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx25.c
@@ -14,7 +14,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx27.c b/drivers/pinctrl/freescale/pinctrl-imx27.c
index afeb39957203..37fdac794455 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx27.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx27.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx28.c b/drivers/pinctrl/freescale/pinctrl-imx28.c
index eb847151713a..aa013ba280b3 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx28.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx28.c
@@ -6,7 +6,6 @@
 // Copyright 2012 Freescale Semiconductor, Inc.
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 #include "pinctrl-mxs.h"
diff --git a/drivers/pinctrl/freescale/pinctrl-imx35.c b/drivers/pinctrl/freescale/pinctrl-imx35.c
index 1546517d8110..88aa0583b0d2 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx35.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx35.c
@@ -12,7 +12,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx50.c b/drivers/pinctrl/freescale/pinctrl-imx50.c
index 9b044aee4f7c..b54f98cfa63c 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx50.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx50.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx51.c b/drivers/pinctrl/freescale/pinctrl-imx51.c
index e580c022bebe..fb0a81a6d29c 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx51.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx51.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx53.c b/drivers/pinctrl/freescale/pinctrl-imx53.c
index 1034192ab410..3c94ec4dffbe 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx53.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx53.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx6dl.c b/drivers/pinctrl/freescale/pinctrl-imx6dl.c
index 09542fdcd405..6a1cafa69230 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx6dl.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx6dl.c
@@ -8,7 +8,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx6q.c b/drivers/pinctrl/freescale/pinctrl-imx6q.c
index ae5cec74a3e8..3ba2ff757322 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx6q.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx6q.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx6sl.c b/drivers/pinctrl/freescale/pinctrl-imx6sl.c
index 3111f50263f6..15483f10f743 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx6sl.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx6sl.c
@@ -8,7 +8,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx6sll.c b/drivers/pinctrl/freescale/pinctrl-imx6sll.c
index 72a7214811ab..27d24f5d58e4 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx6sll.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx6sll.c
@@ -7,7 +7,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx6sx.c b/drivers/pinctrl/freescale/pinctrl-imx6sx.c
index aa76bc6d7402..4e4b78b5b42d 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx6sx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx6sx.c
@@ -8,7 +8,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx7ulp.c b/drivers/pinctrl/freescale/pinctrl-imx7ulp.c
index ba0ef1ea5722..063805daee03 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx7ulp.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx7ulp.c
@@ -8,7 +8,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8dxl.c b/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
index 7dec709ebd9a..fe957d09eb40 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
@@ -8,7 +8,6 @@
 #include <linux/firmware/imx/sci.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8mq.c b/drivers/pinctrl/freescale/pinctrl-imx8mq.c
index e59e4fc80193..845aed2f0e34 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8mq.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8mq.c
@@ -8,7 +8,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8qxp.c b/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
index 37ef3229231b..884c8311be70 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
@@ -10,7 +10,6 @@
 #include <linux/firmware/imx/sci.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pinctrl/pinctrl.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8ulp.c b/drivers/pinctrl/freescale/pinctrl-imx8ulp.c
index 5632c7285147..88af25b0d48e 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8ulp.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8ulp.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-imx91.c b/drivers/pinctrl/freescale/pinctrl-imx91.c
index 5421141c586a..312a81d79fb3 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx91.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx91.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-imx93.c b/drivers/pinctrl/freescale/pinctrl-imx93.c
index 5977dda3b759..8458a41c583e 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx93.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx93.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/freescale/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c
index 76adcc5abdec..76a4bc0181a0 100644
--- a/drivers/pinctrl/freescale/pinctrl-vf610.c
+++ b/drivers/pinctrl/freescale/pinctrl-vf610.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/pinctrl.h>
 
diff --git a/drivers/pinctrl/intel/pinctrl-alderlake.c b/drivers/pinctrl/intel/pinctrl-alderlake.c
index dcb541976f2f..415bc0a16957 100644
--- a/drivers/pinctrl/intel/pinctrl-alderlake.c
+++ b/drivers/pinctrl/intel/pinctrl-alderlake.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-broxton.c b/drivers/pinctrl/intel/pinctrl-broxton.c
index a33100f28488..269b8e25db84 100644
--- a/drivers/pinctrl/intel/pinctrl-broxton.c
+++ b/drivers/pinctrl/intel/pinctrl-broxton.c
@@ -6,7 +6,6 @@
  * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c
index baa7c9a62ff9..b45480e05312 100644
--- a/drivers/pinctrl/intel/pinctrl-cannonlake.c
+++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c
@@ -7,7 +7,6 @@
  *          Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-cedarfork.c b/drivers/pinctrl/intel/pinctrl-cedarfork.c
index 578e1ee57acf..02fd1cc4fd1b 100644
--- a/drivers/pinctrl/intel/pinctrl-cedarfork.c
+++ b/drivers/pinctrl/intel/pinctrl-cedarfork.c
@@ -6,7 +6,6 @@
  * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-denverton.c b/drivers/pinctrl/intel/pinctrl-denverton.c
index 09aee90dee82..47636a9719ed 100644
--- a/drivers/pinctrl/intel/pinctrl-denverton.c
+++ b/drivers/pinctrl/intel/pinctrl-denverton.c
@@ -6,7 +6,6 @@
  * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-elkhartlake.c b/drivers/pinctrl/intel/pinctrl-elkhartlake.c
index 8a24ef12141d..822724c7571b 100644
--- a/drivers/pinctrl/intel/pinctrl-elkhartlake.c
+++ b/drivers/pinctrl/intel/pinctrl-elkhartlake.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-emmitsburg.c b/drivers/pinctrl/intel/pinctrl-emmitsburg.c
index 3b63b6dd2560..f5a602ba49af 100644
--- a/drivers/pinctrl/intel/pinctrl-emmitsburg.c
+++ b/drivers/pinctrl/intel/pinctrl-emmitsburg.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c
index 8dcac4fe8493..21d0d5051b04 100644
--- a/drivers/pinctrl/intel/pinctrl-geminilake.c
+++ b/drivers/pinctrl/intel/pinctrl-geminilake.c
@@ -6,7 +6,6 @@
  * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-intel-platform.c b/drivers/pinctrl/intel/pinctrl-intel-platform.c
index 61dd579e3f97..c83e3859b655 100644
--- a/drivers/pinctrl/intel/pinctrl-intel-platform.c
+++ b/drivers/pinctrl/intel/pinctrl-intel-platform.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-jasperlake.c b/drivers/pinctrl/intel/pinctrl-jasperlake.c
index a8f65c3dbb1c..55780654a847 100644
--- a/drivers/pinctrl/intel/pinctrl-jasperlake.c
+++ b/drivers/pinctrl/intel/pinctrl-jasperlake.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-lakefield.c b/drivers/pinctrl/intel/pinctrl-lakefield.c
index 39872c352ac2..8a1ef3b75ea0 100644
--- a/drivers/pinctrl/intel/pinctrl-lakefield.c
+++ b/drivers/pinctrl/intel/pinctrl-lakefield.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-lewisburg.c b/drivers/pinctrl/intel/pinctrl-lewisburg.c
index ebbc94047b6f..4bf5010afd71 100644
--- a/drivers/pinctrl/intel/pinctrl-lewisburg.c
+++ b/drivers/pinctrl/intel/pinctrl-lewisburg.c
@@ -6,7 +6,6 @@
  * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 83b4d1862545..5cf54bc18f86 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -8,7 +8,6 @@
 
 #include <linux/array_size.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
diff --git a/drivers/pinctrl/intel/pinctrl-meteorlake.c b/drivers/pinctrl/intel/pinctrl-meteorlake.c
index 3f5070a339bf..6fefee7827ed 100644
--- a/drivers/pinctrl/intel/pinctrl-meteorlake.c
+++ b/drivers/pinctrl/intel/pinctrl-meteorlake.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-meteorpoint.c b/drivers/pinctrl/intel/pinctrl-meteorpoint.c
index bff7be1f137d..f7fe3c20951c 100644
--- a/drivers/pinctrl/intel/pinctrl-meteorpoint.c
+++ b/drivers/pinctrl/intel/pinctrl-meteorpoint.c
@@ -6,7 +6,6 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-moorefield.c b/drivers/pinctrl/intel/pinctrl-moorefield.c
index 30f9a4481827..59f46b0e2156 100644
--- a/drivers/pinctrl/intel/pinctrl-moorefield.c
+++ b/drivers/pinctrl/intel/pinctrl-moorefield.c
@@ -8,7 +8,6 @@
 
 #include <linux/array_size.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
index 308651091d9c..77ac32ab9577 100644
--- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
+++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
@@ -7,7 +7,6 @@
  *          Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/intel/pinctrl-tigerlake.c b/drivers/pinctrl/intel/pinctrl-tigerlake.c
index ae231f7fba49..3ac35a153e8c 100644
--- a/drivers/pinctrl/intel/pinctrl-tigerlake.c
+++ b/drivers/pinctrl/intel/pinctrl-tigerlake.c
@@ -7,7 +7,6 @@
  *          Mika Westerberg <mika.westerberg@linux.intel.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c b/drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
index 1b060a038920..a390caa83181 100644
--- a/drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
+++ b/drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
@@ -4,7 +4,6 @@
 #include <linux/cleanup.h>
 #include <linux/module.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c b/drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c
index 15d73ea1028c..ea1026a0d22c 100644
--- a/drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c
+++ b/drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c
@@ -3,7 +3,6 @@
 #include <linux/bitfield.h>
 #include <linux/module.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c b/drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
index a0b3e839cf3b..633ef40e1c27 100644
--- a/drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
+++ b/drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
@@ -3,7 +3,6 @@
 #include <linux/bitfield.h>
 #include <linux/module.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c b/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
index 9d4627c80a52..132615959e67 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
@@ -7,7 +7,6 @@
  */
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
index 13ed87d5d30c..0df749cbcba8 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
@@ -8,7 +8,6 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
index 0aae1a253459..a68d55caef25 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
diff --git a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
index d624a4d302a8..bc030abdadca 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
@@ -16,7 +16,6 @@
 #include <linux/irq.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/pinctrl/pinctrl-as3722.c b/drivers/pinctrl/pinctrl-as3722.c
index e713dea98aa8..3d2f477aac9e 100644
--- a/drivers/pinctrl/pinctrl-as3722.c
+++ b/drivers/pinctrl/pinctrl-as3722.c
@@ -10,7 +10,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/driver.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mfd/as3722.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
index 093ae7c1dae5..9a54b259ef4b 100644
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/pinctrl/pinctrl-da850-pupd.c b/drivers/pinctrl/pinctrl-da850-pupd.c
index 5eb248663e17..c5f243d1311f 100644
--- a/drivers/pinctrl/pinctrl-da850-pupd.c
+++ b/drivers/pinctrl/pinctrl-da850-pupd.c
@@ -9,7 +9,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
index 2e16f09aeb47..58f22b4a5a6f 100644
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
@@ -14,7 +14,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 
diff --git a/drivers/pinctrl/pinctrl-eic7700.c b/drivers/pinctrl/pinctrl-eic7700.c
index ffcd0ec5c2dc..d553ec20c619 100644
--- a/drivers/pinctrl/pinctrl-eic7700.c
+++ b/drivers/pinctrl/pinctrl-eic7700.c
@@ -11,7 +11,6 @@
 #include <linux/bitfield.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/pinctrl-eyeq5.c b/drivers/pinctrl/pinctrl-eyeq5.c
index dcdf80f07a90..19d845b47939 100644
--- a/drivers/pinctrl/pinctrl-eyeq5.c
+++ b/drivers/pinctrl/pinctrl-eyeq5.c
@@ -25,7 +25,6 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 29d7f4e54bc7..1aa6a6dc1209 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/pinctrl-loongson2.c b/drivers/pinctrl/pinctrl-loongson2.c
index 4d4fbeadafb7..7d04fa81d2e5 100644
--- a/drivers/pinctrl/pinctrl-loongson2.c
+++ b/drivers/pinctrl/pinctrl-loongson2.c
@@ -8,7 +8,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinmux.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c
index 5e0201768323..9431810ffaff 100644
--- a/drivers/pinctrl/pinctrl-lpc18xx.c
+++ b/drivers/pinctrl/pinctrl-lpc18xx.c
@@ -12,7 +12,6 @@
 #include <linux/clk.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <linux/pinctrl/pinconf-generic.h>
diff --git a/drivers/pinctrl/pinctrl-max77620.c b/drivers/pinctrl/pinctrl-max77620.c
index c47eccce7dc0..0fa28d697e8c 100644
--- a/drivers/pinctrl/pinctrl-max77620.c
+++ b/drivers/pinctrl/pinctrl-max77620.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/mfd/max77620.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index b89b3169e8be..a4f0ba728c6e 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -5,7 +5,6 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/export.h>
 #include <linux/gpio/driver.h>
diff --git a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
index f3dffa3c74d3..928b66531858 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
@@ -2,7 +2,6 @@
 /* MCP23S08 I2C GPIO driver */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/pinctrl/pinctrl-mcp23s08_spi.c b/drivers/pinctrl/pinctrl-mcp23s08_spi.c
index 30775d31bd69..bacebcff67ef 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08_spi.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08_spi.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* MCP23S08 SPI GPIO driver */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c
index 7a6cb5f502b0..aa0f7c809978 100644
--- a/drivers/pinctrl/pinctrl-microchip-sgpio.c
+++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/io.h>
 #include <linux/mfd/ocelot.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/pinctrl-mlxbf3.c b/drivers/pinctrl/pinctrl-mlxbf3.c
index fcd9d46de89f..1b285c9ee05a 100644
--- a/drivers/pinctrl/pinctrl-mlxbf3.c
+++ b/drivers/pinctrl/pinctrl-mlxbf3.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
 
diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
index 0b33b01dbaad..cc5cd2a538c5 100644
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
@@ -10,7 +10,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c
index f22be6b7b82a..1bb36ca477b7 100644
--- a/drivers/pinctrl/pinctrl-scmi.c
+++ b/drivers/pinctrl/pinctrl-scmi.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/scmi_protocol.h>
 #include <linux/slab.h>
diff --git a/drivers/pinctrl/pinctrl-th1520.c b/drivers/pinctrl/pinctrl-th1520.c
index 4d5a99483dee..50a5889df7c4 100644
--- a/drivers/pinctrl/pinctrl-th1520.c
+++ b/drivers/pinctrl/pinctrl-th1520.c
@@ -11,7 +11,6 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
diff --git a/drivers/pinctrl/pinctrl-tps6594.c b/drivers/pinctrl/pinctrl-tps6594.c
index 55dfa843e35e..456a3cfc8de9 100644
--- a/drivers/pinctrl/pinctrl-tps6594.c
+++ b/drivers/pinctrl/pinctrl-tps6594.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/pinctrl/pinmux.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 
 #include <linux/mfd/tps6594.h>
 
diff --git a/drivers/pinctrl/qcom/pinctrl-ipq5018.c b/drivers/pinctrl/qcom/pinctrl-ipq5018.c
index 0698c8f0110b..03cfba9534f8 100644
--- a/drivers/pinctrl/qcom/pinctrl-ipq5018.c
+++ b/drivers/pinctrl/qcom/pinctrl-ipq5018.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "pinctrl-msm.h"
diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c
index fb624a051e26..4885648050bf 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1310.c
@@ -11,7 +11,6 @@
 
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "pinctrl-spear.h"
 
diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c
index 48f068cf5e24..f6b681cfe9e8 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1340.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1340.c
@@ -11,7 +11,6 @@
 
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "pinctrl-spear.h"
 
diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
index 7530252ef7bc..4391185d1e46 100644
--- a/drivers/pinctrl/spear/pinctrl-spear300.c
+++ b/drivers/pinctrl/spear/pinctrl-spear300.c
@@ -11,7 +11,6 @@
 
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "pinctrl-spear3xx.h"
 
diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c
index c476e5478646..6418bb666bfb 100644
--- a/drivers/pinctrl/spear/pinctrl-spear310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear310.c
@@ -11,7 +11,6 @@
 
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "pinctrl-spear3xx.h"
 
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c
index 401477cfbf57..73a208977600 100644
--- a/drivers/pinctrl/spear/pinctrl-spear320.c
+++ b/drivers/pinctrl/spear/pinctrl-spear320.c
@@ -11,7 +11,6 @@
 
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include "pinctrl-spear3xx.h"
 
diff --git a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c
index d14f382f2392..e6ca2701dbd1 100644
--- a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c
+++ b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "pinctrl-sprd.h"
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
index 25cb98d9c54e..37da176cad49 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
@@ -10,7 +10,6 @@
 #include <linux/clk.h>
 #include <linux/gpio/driver.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
index 3433b3c91692..fab18e895330 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
@@ -10,7 +10,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c
index 44f84e4c29bf..77039012521a 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c
@@ -9,7 +9,6 @@
 #include <linux/bits.h>
 #include <linux/gpio/driver.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index ec359cb873c4..7fcb6cdc1e86 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -10,7 +10,6 @@
 #include <linux/clk.h>
 #include <linux/gpio/driver.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra234.c b/drivers/pinctrl/tegra/pinctrl-tegra234.c
index 86c2b84e792d..fb9feae590f8 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra234.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra234.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2021-2023, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra238.c b/drivers/pinctrl/tegra/pinctrl-tegra238.c
index d3809594a5b5..ec482365f14f 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra238.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra238.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2022-2026, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra264.c b/drivers/pinctrl/tegra/pinctrl-tegra264.c
index 5a0c91aaba3a..be64fba34dce 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra264.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra264.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2024-2026, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index 65ed20bc1fa2..f1019f041f11 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index a68b21fbd0c7..bb52497d5fc4 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index 88fd68f86a85..3aebc77529ed 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 374c029ebc02..07706b57bc37 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c
index 4fd3ec511d37..25a5e4db6e98 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c
@@ -5,7 +5,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 4f63d7b1a252..bc20a2d0d64d 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 4277d494a348..39915be4128c 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 2a9dbf969f0b..cd6429f58276 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
index ab3bd2d9c6c7..d07788c785d4 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
@@ -5,7 +5,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 087e8db8f11d..78d254070988 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -5,7 +5,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c
index 47e03014dcbe..399ab85b6191 100644
--- a/drivers/platform/chrome/cros_ec_chardev.c
+++ b/drivers/platform/chrome/cros_ec_chardev.c
@@ -15,7 +15,6 @@
 #include <linux/fs.h>
 #include <linux/kref.h>
 #include <linux/miscdevice.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/platform_data/cros_ec_chardev.h>
diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index d10f9561990c..139cab6fcba1 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -7,7 +7,6 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index f69f2f6de276..ac919c14c631 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -9,7 +9,6 @@
 #include <linux/fs.h>
 #include <linux/kobject.h>
 #include <linux/kstrtox.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/platform/chrome/cros_ec_sensorhub.c b/drivers/platform/chrome/cros_ec_sensorhub.c
index f938c3fc84e4..f7019fb80a76 100644
--- a/drivers/platform/chrome/cros_ec_sensorhub.c
+++ b/drivers/platform/chrome/cros_ec_sensorhub.c
@@ -9,7 +9,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index 9d3767ab1548..b668a3cc118e 100644
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/kobject.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
index 5ee8adaa6564..061e84b32b04 100644
--- a/drivers/platform/chrome/cros_ec_vbc.c
+++ b/drivers/platform/chrome/cros_ec_vbc.c
@@ -6,7 +6,6 @@
 
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/platform/chrome/cros_kbd_led_backlight.c b/drivers/platform/chrome/cros_kbd_led_backlight.c
index 80dc52833dc9..906eb490e506 100644
--- a/drivers/platform/chrome/cros_kbd_led_backlight.c
+++ b/drivers/platform/chrome/cros_kbd_led_backlight.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/leds.h>
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/platform/chrome/cros_usbpd_logger.c b/drivers/platform/chrome/cros_usbpd_logger.c
index d343e1ab6f08..060a49f2b962 100644
--- a/drivers/platform/chrome/cros_usbpd_logger.c
+++ b/drivers/platform/chrome/cros_usbpd_logger.c
@@ -8,7 +8,6 @@
 #include <linux/devm-helpers.h>
 #include <linux/ktime.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/platform/chrome/cros_usbpd_notify.c b/drivers/platform/chrome/cros_usbpd_notify.c
index c90174360004..828f00a3191b 100644
--- a/drivers/platform/chrome/cros_usbpd_notify.c
+++ b/drivers/platform/chrome/cros_usbpd_notify.c
@@ -7,7 +7,6 @@
 
 #include <linux/acpi.h>
 #include <linux/fwnode.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_proto.h>
 #include <linux/platform_data/cros_usbpd_notify.h>
diff --git a/drivers/platform/chrome/wilco_ec/core.c b/drivers/platform/chrome/wilco_ec/core.c
index 9f978e531e1f..fd2a9bc8327c 100644
--- a/drivers/platform/chrome/wilco_ec/core.c
+++ b/drivers/platform/chrome/wilco_ec/core.c
@@ -10,7 +10,6 @@
 #include <linux/acpi.h>
 #include <linux/device.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/wilco-ec.h>
 #include <linux/platform_device.h>
diff --git a/drivers/platform/chrome/wilco_ec/debugfs.c b/drivers/platform/chrome/wilco_ec/debugfs.c
index 0617292b5cd7..e43ad67b9bcb 100644
--- a/drivers/platform/chrome/wilco_ec/debugfs.c
+++ b/drivers/platform/chrome/wilco_ec/debugfs.c
@@ -10,7 +10,6 @@
 #include <linux/ctype.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/wilco-ec.h>
 #include <linux/platform_device.h>
diff --git a/drivers/platform/chrome/wilco_ec/telemetry.c b/drivers/platform/chrome/wilco_ec/telemetry.c
index cadb68fa0a40..05e35d1b16a6 100644
--- a/drivers/platform/chrome/wilco_ec/telemetry.c
+++ b/drivers/platform/chrome/wilco_ec/telemetry.c
@@ -30,7 +30,6 @@
 #include <linux/cdev.h>
 #include <linux/device.h>
 #include <linux/fs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/wilco-ec.h>
 #include <linux/platform_device.h>
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 75c86f5688c9..fa241ca8feb0 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -48,7 +48,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
diff --git a/drivers/platform/x86/asus-tf103c-dock.c b/drivers/platform/x86/asus-tf103c-dock.c
index f09a3fc6524a..92466477de9a 100644
--- a/drivers/platform/x86/asus-tf103c-dock.c
+++ b/drivers/platform/x86/asus-tf103c-dock.c
@@ -21,7 +21,6 @@
 #include <linux/input.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
-#include <linux/mod_devicetable.h>
 #include <linux/moduleparam.h>
 #include <linux/module.h>
 #include <linux/pm.h>
diff --git a/drivers/platform/x86/intel/atomisp2/led.c b/drivers/platform/x86/intel/atomisp2/led.c
index 10077a61d8c5..344ea57d9736 100644
--- a/drivers/platform/x86/intel/atomisp2/led.c
+++ b/drivers/platform/x86/intel/atomisp2/led.c
@@ -11,7 +11,6 @@
 #include <linux/gpio/machine.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/workqueue.h>
 
diff --git a/drivers/platform/x86/intel/atomisp2/pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
index 805fc0d8515c..ad1f99140962 100644
--- a/drivers/platform/x86/intel/atomisp2/pm.c
+++ b/drivers/platform/x86/intel/atomisp2/pm.c
@@ -13,7 +13,6 @@
 
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <asm/iosf_mbi.h>
diff --git a/drivers/platform/x86/intel/bxtwc_tmu.c b/drivers/platform/x86/intel/bxtwc_tmu.c
index 99437b2ccc25..b3666704d85b 100644
--- a/drivers/platform/x86/intel/bxtwc_tmu.c
+++ b/drivers/platform/x86/intel/bxtwc_tmu.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/intel_soc_pmic.h>
diff --git a/drivers/platform/x86/intel/ehl_pse_io.c b/drivers/platform/x86/intel/ehl_pse_io.c
index 861e14808b35..f75f3a8cc6b0 100644
--- a/drivers/platform/x86/intel/ehl_pse_io.c
+++ b/drivers/platform/x86/intel/ehl_pse_io.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/gfp_types.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/sizes.h>
diff --git a/drivers/platform/x86/intel/plr_tpmi.c b/drivers/platform/x86/intel/plr_tpmi.c
index 8faecc311038..f98c241edee4 100644
--- a/drivers/platform/x86/intel/plr_tpmi.c
+++ b/drivers/platform/x86/intel/plr_tpmi.c
@@ -20,7 +20,6 @@
 #include <linux/kstrtox.h>
 #include <linux/lockdep.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
 #include <linux/seq_file.h>
diff --git a/drivers/platform/x86/intel/punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c
index 14513010daad..6d770b950dfb 100644
--- a/drivers/platform/x86/intel/punit_ipc.c
+++ b/drivers/platform/x86/intel/punit_ipc.c
@@ -13,7 +13,6 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/platform/x86/intel_scu_pltdrv.c b/drivers/platform/x86/intel_scu_pltdrv.c
index 0892362acd7b..d5ab62cbf5cc 100644
--- a/drivers/platform/x86/intel_scu_pltdrv.c
+++ b/drivers/platform/x86/intel_scu_pltdrv.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/platform/x86/nvidia-wmi-ec-backlight.c b/drivers/platform/x86/nvidia-wmi-ec-backlight.c
index 1b572c90c76e..b4eebfb96fe5 100644
--- a/drivers/platform/x86/nvidia-wmi-ec-backlight.c
+++ b/drivers/platform/x86/nvidia-wmi-ec-backlight.c
@@ -5,7 +5,6 @@
 
 #include <linux/acpi.h>
 #include <linux/backlight.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/x86/nvidia-wmi-ec-backlight.h>
 #include <linux/types.h>
diff --git a/drivers/platform/x86/quickstart.c b/drivers/platform/x86/quickstart.c
index acb58518be37..186a243a012d 100644
--- a/drivers/platform/x86/quickstart.c
+++ b/drivers/platform/x86/quickstart.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
diff --git a/drivers/platform/x86/uniwill/uniwill-wmi.c b/drivers/platform/x86/uniwill/uniwill-wmi.c
index 097882f10b1e..a2075cb9a5f1 100644
--- a/drivers/platform/x86/uniwill/uniwill-wmi.c
+++ b/drivers/platform/x86/uniwill/uniwill-wmi.c
@@ -14,7 +14,6 @@
 #include <linux/acpi.h>
 #include <linux/device.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/notifier.h>
 #include <linux/printk.h>
 #include <linux/types.h>
diff --git a/drivers/platform/x86/x86-android-tablets/dmi.c b/drivers/platform/x86/x86-android-tablets/dmi.c
index 4a5720d6fc1d..2ab53030e5a4 100644
--- a/drivers/platform/x86/x86-android-tablets/dmi.c
+++ b/drivers/platform/x86/x86-android-tablets/dmi.c
@@ -10,7 +10,6 @@
 
 #include <linux/dmi.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "x86-android-tablets.h"
diff --git a/drivers/pmdomain/actions/owl-sps.c b/drivers/pmdomain/actions/owl-sps.c
index 3a586d1f3256..bf5eb80cc3b4 100644
--- a/drivers/pmdomain/actions/owl-sps.c
+++ b/drivers/pmdomain/actions/owl-sps.c
@@ -8,7 +8,6 @@
  * Copyright (c) 2017 Andreas Färber
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pmdomain/imx/imx93-pd.c b/drivers/pmdomain/imx/imx93-pd.c
index d68273330687..50d1eb852f75 100644
--- a/drivers/pmdomain/imx/imx93-pd.c
+++ b/drivers/pmdomain/imx/imx93-pd.c
@@ -6,7 +6,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
diff --git a/drivers/pmdomain/marvell/pxa1908-power-controller.c b/drivers/pmdomain/marvell/pxa1908-power-controller.c
index 543e8d33ac0c..4a957ab0e4f5 100644
--- a/drivers/pmdomain/marvell/pxa1908-power-controller.c
+++ b/drivers/pmdomain/marvell/pxa1908-power-controller.c
@@ -8,7 +8,6 @@
 #include <linux/dev_printk.h>
 #include <linux/device.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_domain.h>
 #include <linux/regmap.h>
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index a0927081a003..fbf03ff007eb 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -10,7 +10,6 @@
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 #include <linux/slab.h>
-#include <linux/mod_devicetable.h>
 
 #include "../base.h"
 #include "pnpacpi.h"
diff --git a/drivers/power/reset/brcm-kona-reset.c b/drivers/power/reset/brcm-kona-reset.c
index ee3f1bb97653..60d7000412f1 100644
--- a/drivers/power/reset/brcm-kona-reset.c
+++ b/drivers/power/reset/brcm-kona-reset.c
@@ -2,7 +2,6 @@
 // Copyright (C) 2016 Broadcom
 
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 
diff --git a/drivers/power/reset/ep93xx-restart.c b/drivers/power/reset/ep93xx-restart.c
index 57cfb8620faf..119394bb0305 100644
--- a/drivers/power/reset/ep93xx-restart.c
+++ b/drivers/power/reset/ep93xx-restart.c
@@ -11,7 +11,6 @@
 #include <linux/errno.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/slab.h>
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index 3eaae352ffb9..1cd5900be038 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/reboot.h>
 
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 90c664d344d0..c3a0435938c8 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -53,7 +53,6 @@
 #include <linux/kmod.h>
 #include <linux/module.h>
 #include <linux/panic_notifier.h>
-#include <linux/mod_devicetable.h>
 #include <linux/gpio/consumer.h>
 #include <linux/reboot.h>
 #include <linux/property.h>
diff --git a/drivers/power/reset/macsmc-reboot.c b/drivers/power/reset/macsmc-reboot.c
index e9702acdd366..9fc36fa68676 100644
--- a/drivers/power/reset/macsmc-reboot.c
+++ b/drivers/power/reset/macsmc-reboot.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/macsmc.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/nvmem-consumer.h>
 #include <linux/platform_device.h>
diff --git a/drivers/power/reset/ocelot-reset.c b/drivers/power/reset/ocelot-reset.c
index 56be64decf54..9d4b8afb6cbb 100644
--- a/drivers/power/reset/ocelot-reset.c
+++ b/drivers/power/reset/ocelot-reset.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/notifier.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mfd/syscon.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/power/reset/pwr-mlxbf.c b/drivers/power/reset/pwr-mlxbf.c
index 4f1cd1c0018c..15d92c9f64dd 100644
--- a/drivers/power/reset/pwr-mlxbf.c
+++ b/drivers/power/reset/pwr-mlxbf.c
@@ -9,7 +9,6 @@
 #include <linux/devm-helpers.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/power/reset/qemu-virt-ctrl.c b/drivers/power/reset/qemu-virt-ctrl.c
index aa8355270b2c..97875007fda3 100644
--- a/drivers/power/reset/qemu-virt-ctrl.c
+++ b/drivers/power/reset/qemu-virt-ctrl.c
@@ -7,7 +7,6 @@
 
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 
diff --git a/drivers/power/reset/sc27xx-poweroff.c b/drivers/power/reset/sc27xx-poweroff.c
index 6376706bf561..a9378247e3fb 100644
--- a/drivers/power/reset/sc27xx-poweroff.c
+++ b/drivers/power/reset/sc27xx-poweroff.c
@@ -6,7 +6,6 @@
 
 #include <linux/cpu.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/drivers/power/reset/spacemit-p1-reboot.c b/drivers/power/reset/spacemit-p1-reboot.c
index 84026b042ea2..c0454b547718 100644
--- a/drivers/power/reset/spacemit-p1-reboot.c
+++ b/drivers/power/reset/spacemit-p1-reboot.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/bits.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/reboot.h>
diff --git a/drivers/power/reset/tdx-ec-poweroff.c b/drivers/power/reset/tdx-ec-poweroff.c
index 8040aa03d74d..b4f1c87f5651 100644
--- a/drivers/power/reset/tdx-ec-poweroff.c
+++ b/drivers/power/reset/tdx-ec-poweroff.c
@@ -14,7 +14,6 @@
 #include <linux/dev_printk.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/reboot.h>
 #include <linux/regmap.h>
diff --git a/drivers/power/reset/tps65086-restart.c b/drivers/power/reset/tps65086-restart.c
index 37d248a9df17..44a290f961ff 100644
--- a/drivers/power/reset/tps65086-restart.c
+++ b/drivers/power/reset/tps65086-restart.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/mfd/tps65086.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
diff --git a/drivers/power/sequencing/pwrseq-pcie-m2.c b/drivers/power/sequencing/pwrseq-pcie-m2.c
index 94c3f4b7ee36..8f6f6795be6c 100644
--- a/drivers/power/sequencing/pwrseq-pcie-m2.c
+++ b/drivers/power/sequencing/pwrseq-pcie-m2.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/list.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
diff --git a/drivers/power/sequencing/pwrseq-qcom-wcn.c b/drivers/power/sequencing/pwrseq-qcom-wcn.c
index b55b4317e21b..d41793e1fcd9 100644
--- a/drivers/power/sequencing/pwrseq-qcom-wcn.c
+++ b/drivers/power/sequencing/pwrseq-qcom-wcn.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/power/supply/adp5061.c b/drivers/power/supply/adp5061.c
index 7d5754c24553..7478986e6b3c 100644
--- a/drivers/power/supply/adp5061.c
+++ b/drivers/power/supply/adp5061.c
@@ -11,7 +11,6 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/mod_devicetable.h>
 #include <linux/power_supply.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
diff --git a/drivers/power/supply/bd71828-power.c b/drivers/power/supply/bd71828-power.c
index b671563ead79..19f24f859666 100644
--- a/drivers/power/supply/bd71828-power.c
+++ b/drivers/power/supply/bd71828-power.c
@@ -7,7 +7,6 @@
 #include <linux/mfd/rohm-bd71828.h>
 #include <linux/mfd/rohm-bd72720.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/power_supply.h>
diff --git a/drivers/power/supply/bd99954-charger.c b/drivers/power/supply/bd99954-charger.c
index 5c447b088223..b3068c2197c7 100644
--- a/drivers/power/supply/bd99954-charger.c
+++ b/drivers/power/supply/bd99954-charger.c
@@ -61,7 +61,6 @@
 #include <linux/kernel.h>
 #include <linux/linear_range.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/power_supply.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c
index 6700d578a98f..8e28f86ae09f 100644
--- a/drivers/power/supply/bq24190_charger.c
+++ b/drivers/power/supply/bq24190_charger.c
@@ -5,7 +5,6 @@
  * Author: Mark A. Greer <mgreer@animalcreek.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
diff --git a/drivers/power/supply/chagall-battery.c b/drivers/power/supply/chagall-battery.c
index 8b05422aca6f..129566d0bd9d 100644
--- a/drivers/power/supply/chagall-battery.c
+++ b/drivers/power/supply/chagall-battery.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/power_supply.h>
 #include <linux/regmap.h>
diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 24221244b45b..ec8d2a9245d9 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -18,7 +18,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/notifier.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/property.h>
diff --git a/drivers/power/supply/cros_charge-control.c b/drivers/power/supply/cros_charge-control.c
index e1b8f3b1b7de..e0f168624807 100644
--- a/drivers/power/supply/cros_charge-control.c
+++ b/drivers/power/supply/cros_charge-control.c
@@ -8,7 +8,6 @@
 #include <linux/container_of.h>
 #include <linux/dmi.h>
 #include <linux/lockdep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/power/supply/cros_peripheral_charger.c b/drivers/power/supply/cros_peripheral_charger.c
index 9f67a6dbd94e..612bc7badac0 100644
--- a/drivers/power/supply/cros_peripheral_charger.c
+++ b/drivers/power/supply/cros_peripheral_charger.c
@@ -5,7 +5,6 @@
  * Copyright 2020 Google LLC.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c
index 308e1d4e6dd8..c1cbe6e5476e 100644
--- a/drivers/power/supply/cros_usbpd-charger.c
+++ b/drivers/power/supply/cros_usbpd-charger.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2014 - 2018 Google, Inc
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/power/supply/lego_ev3_battery.c b/drivers/power/supply/lego_ev3_battery.c
index 28454de05761..582644f4e8b3 100644
--- a/drivers/power/supply/lego_ev3_battery.c
+++ b/drivers/power/supply/lego_ev3_battery.c
@@ -20,7 +20,6 @@
 #include <linux/iio/types.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/property.h>
diff --git a/drivers/power/supply/max14656_charger_detector.c b/drivers/power/supply/max14656_charger_detector.c
index b6c3bc0d9ec1..81798f22a037 100644
--- a/drivers/power/supply/max14656_charger_detector.c
+++ b/drivers/power/supply/max14656_charger_detector.c
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/power_supply.h>
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index 639dacdb9b31..d409d2f0d383 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
-#include <linux/mod_devicetable.h>
 #include <linux/power_supply.h>
 #include <linux/power/max17042_battery.h>
 #include <linux/of.h>
diff --git a/drivers/power/supply/max77759_charger.c b/drivers/power/supply/max77759_charger.c
index c606d7bafcb8..41d810bb6744 100644
--- a/drivers/power/supply/max77759_charger.c
+++ b/drivers/power/supply/max77759_charger.c
@@ -14,7 +14,6 @@
 #include <linux/linear_range.h>
 #include <linux/mfd/max77759.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/power/supply/max8971_charger.c b/drivers/power/supply/max8971_charger.c
index 49a05858bef8..82f20b89b6b4 100644
--- a/drivers/power/supply/max8971_charger.c
+++ b/drivers/power/supply/max8971_charger.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/extcon.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_graph.h>
 #include <linux/property.h>
 #include <linux/interrupt.h>
diff --git a/drivers/power/supply/max8998_charger.c b/drivers/power/supply/max8998_charger.c
index b0eda2b51e7f..13071350f318 100644
--- a/drivers/power/supply/max8998_charger.c
+++ b/drivers/power/supply/max8998_charger.c
@@ -7,7 +7,6 @@
 
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
diff --git a/drivers/power/supply/mp2629_charger.c b/drivers/power/supply/mp2629_charger.c
index d281c1059629..f758d6a7bc8c 100644
--- a/drivers/power/supply/mp2629_charger.c
+++ b/drivers/power/supply/mp2629_charger.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/mp2629.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/regmap.h>
diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c
index 202c4fa9b903..17433c58fcd4 100644
--- a/drivers/power/supply/olpc_battery.c
+++ b/drivers/power/supply/olpc_battery.c
@@ -7,7 +7,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 #include <linux/err.h>
 #include <linux/device.h>
diff --git a/drivers/power/supply/pm8916_bms_vm.c b/drivers/power/supply/pm8916_bms_vm.c
index de5d571c03e2..b279f79f302c 100644
--- a/drivers/power/supply/pm8916_bms_vm.c
+++ b/drivers/power/supply/pm8916_bms_vm.c
@@ -13,7 +13,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/timekeeping.h>
-#include <linux/mod_devicetable.h>
 
 #define PM8916_PERPH_TYPE 0x04
 #define PM8916_BMS_VM_TYPE 0x020D
diff --git a/drivers/power/supply/pm8916_lbc.c b/drivers/power/supply/pm8916_lbc.c
index 6b631012a795..cdc4d78c4219 100644
--- a/drivers/power/supply/pm8916_lbc.c
+++ b/drivers/power/supply/pm8916_lbc.c
@@ -13,7 +13,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/extcon-provider.h>
-#include <linux/mod_devicetable.h>
 
 /* Two bytes: type + subtype */
 #define PM8916_PERPH_TYPE 0x04
diff --git a/drivers/power/supply/rt5033_charger.c b/drivers/power/supply/rt5033_charger.c
index 536ab29b657d..e545a6e7fad7 100644
--- a/drivers/power/supply/rt5033_charger.c
+++ b/drivers/power/supply/rt5033_charger.c
@@ -8,7 +8,6 @@
 
 #include <linux/devm-helpers.h>
 #include <linux/extcon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
diff --git a/drivers/power/supply/rt9467-charger.c b/drivers/power/supply/rt9467-charger.c
index 44c26fb37a77..de0471e54978 100644
--- a/drivers/power/supply/rt9467-charger.c
+++ b/drivers/power/supply/rt9467-charger.c
@@ -17,7 +17,6 @@
 #include <linux/kstrtox.h>
 #include <linux/linear_range.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/power_supply.h>
diff --git a/drivers/power/supply/rt9471.c b/drivers/power/supply/rt9471.c
index e7f843f12c98..ca7d426849a7 100644
--- a/drivers/power/supply/rt9471.c
+++ b/drivers/power/supply/rt9471.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/kstrtox.h>
 #include <linux/linear_range.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
diff --git a/drivers/power/supply/rt9756.c b/drivers/power/supply/rt9756.c
index f254527be653..a7b7e3fb69b1 100644
--- a/drivers/power/supply/rt9756.c
+++ b/drivers/power/supply/rt9756.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/linear_range.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/power_supply.h>
diff --git a/drivers/power/supply/s2mu005-battery.c b/drivers/power/supply/s2mu005-battery.c
index 64c57a14ef7d..53de6605b492 100644
--- a/drivers/power/supply/s2mu005-battery.c
+++ b/drivers/power/supply/s2mu005-battery.c
@@ -10,7 +10,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/power_supply.h>
 #include <linux/property.h>
diff --git a/drivers/power/supply/ug3105_battery.c b/drivers/power/supply/ug3105_battery.c
index 0cbf45856fac..cccf7499e129 100644
--- a/drivers/power/supply/ug3105_battery.c
+++ b/drivers/power/supply/ug3105_battery.c
@@ -52,7 +52,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/power_supply.h>
 
 #include "adc-battery-helper.h"
diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c
index 935da68610c7..402f910f3e25 100644
--- a/drivers/pps/clients/pps-gpio.c
+++ b/drivers/pps/clients/pps-gpio.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/pps/generators/pps_gen_tio.c b/drivers/pps/generators/pps_gen_tio.c
index 9483d126ada0..5088aaf1a63a 100644
--- a/drivers/pps/generators/pps_gen_tio.c
+++ b/drivers/pps/generators/pps_gen_tio.c
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/hrtimer.h>
 #include <linux/io-64-nonatomic-hi-lo.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pps_gen_kernel.h>
diff --git a/drivers/ptp/ptp_dte.c b/drivers/ptp/ptp_dte.c
index 847276c69008..834ecacc7bd3 100644
--- a/drivers/ptp/ptp_dte.c
+++ b/drivers/ptp/ptp_dte.c
@@ -4,7 +4,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/ptp_clock_kernel.h>
 #include <linux/types.h>
diff --git a/drivers/pwm/pwm-adp5585.c b/drivers/pwm/pwm-adp5585.c
index 806f8d79b0d7..0644ff40f0fb 100644
--- a/drivers/pwm/pwm-adp5585.c
+++ b/drivers/pwm/pwm-adp5585.c
@@ -20,7 +20,6 @@
 #include <linux/mfd/adp5585.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/regmap.h>
diff --git a/drivers/pwm/pwm-airoha.c b/drivers/pwm/pwm-airoha.c
index 7236e31d2f17..0cf6b011520a 100644
--- a/drivers/pwm/pwm-airoha.c
+++ b/drivers/pwm/pwm-airoha.c
@@ -22,7 +22,6 @@
 #include <linux/math64.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/regmap.h>
diff --git a/drivers/pwm/pwm-apple.c b/drivers/pwm/pwm-apple.c
index 6e58aca2f13c..aa49ca1c30e8 100644
--- a/drivers/pwm/pwm-apple.c
+++ b/drivers/pwm/pwm-apple.c
@@ -12,7 +12,6 @@
  * - When APPLE_PWM_CTRL is set to 0, the output is constant low
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-berlin.c b/drivers/pwm/pwm-berlin.c
index 858d36991374..da9954818302 100644
--- a/drivers/pwm/pwm-berlin.c
+++ b/drivers/pwm/pwm-berlin.c
@@ -13,7 +13,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-ep93xx.c b/drivers/pwm/pwm-ep93xx.c
index 994f89ac43b4..3cc1e4008d29 100644
--- a/drivers/pwm/pwm-ep93xx.c
+++ b/drivers/pwm/pwm-ep93xx.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
diff --git a/drivers/pwm/pwm-gpio.c b/drivers/pwm/pwm-gpio.c
index 5f4edeb394a9..5644d78dfead 100644
--- a/drivers/pwm/pwm-gpio.c
+++ b/drivers/pwm/pwm-gpio.c
@@ -16,7 +16,6 @@
 #include <linux/hrtimer.h>
 #include <linux/math.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-intel-lgm.c b/drivers/pwm/pwm-intel-lgm.c
index 084c71a0a11b..3ae1324b1cb7 100644
--- a/drivers/pwm/pwm-intel-lgm.c
+++ b/drivers/pwm/pwm-intel-lgm.c
@@ -17,7 +17,6 @@
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pwm.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
diff --git a/drivers/pwm/pwm-keembay.c b/drivers/pwm/pwm-keembay.c
index 35b641f3f6ed..2e282e067f36 100644
--- a/drivers/pwm/pwm-keembay.c
+++ b/drivers/pwm/pwm-keembay.c
@@ -16,7 +16,6 @@
 #include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-lpc18xx-sct.c b/drivers/pwm/pwm-lpc18xx-sct.c
index 1e614b2a0227..01d471725106 100644
--- a/drivers/pwm/pwm-lpc18xx-sct.c
+++ b/drivers/pwm/pwm-lpc18xx-sct.c
@@ -22,7 +22,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-lpss-platform.c b/drivers/pwm/pwm-lpss-platform.c
index 653ec9d0c8bf..8b95064b8703 100644
--- a/drivers/pwm/pwm-lpss-platform.c
+++ b/drivers/pwm/pwm-lpss-platform.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/pwm/pwm-max7360.c b/drivers/pwm/pwm-max7360.c
index 732969303dd7..f920877d1748 100644
--- a/drivers/pwm/pwm-max7360.c
+++ b/drivers/pwm/pwm-max7360.c
@@ -21,7 +21,6 @@
 #include <linux/math64.h>
 #include <linux/mfd/max7360.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index 80d2fa10919f..156c0c74cd80 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -15,7 +15,6 @@
  *   input clock (PWMCR_SD is set) and the output is driven to inactive.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 4a07315b0744..e11ecf1fa0f9 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -30,7 +30,6 @@
  */
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-sl28cpld.c b/drivers/pwm/pwm-sl28cpld.c
index 934378d6a002..0dc2e3f809c3 100644
--- a/drivers/pwm/pwm-sl28cpld.c
+++ b/drivers/pwm/pwm-sl28cpld.c
@@ -35,7 +35,6 @@
 
 #include <linux/bitfield.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/pwm/pwm-sprd.c b/drivers/pwm/pwm-sprd.c
index 4c76ca5e4cdd..438dbaa3a98f 100644
--- a/drivers/pwm/pwm-sprd.c
+++ b/drivers/pwm/pwm-sprd.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-sunplus.c b/drivers/pwm/pwm-sunplus.c
index b342b843247b..cc8137f108df 100644
--- a/drivers/pwm/pwm-sunplus.c
+++ b/drivers/pwm/pwm-sunplus.c
@@ -23,7 +23,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
diff --git a/drivers/pwm/pwm-vt8500.c b/drivers/pwm/pwm-vt8500.c
index 016c82d65527..149d9e35b78c 100644
--- a/drivers/pwm/pwm-vt8500.c
+++ b/drivers/pwm/pwm-vt8500.c
@@ -6,7 +6,6 @@
  * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
diff --git a/drivers/regulator/adp5055-regulator.c b/drivers/regulator/adp5055-regulator.c
index 4b004a6b2f84..9ebd52b39235 100644
--- a/drivers/regulator/adp5055-regulator.c
+++ b/drivers/regulator/adp5055-regulator.c
@@ -9,7 +9,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/regulator/bd71828-regulator.c b/drivers/regulator/bd71828-regulator.c
index bd61caa8284a..2ced81df0c02 100644
--- a/drivers/regulator/bd71828-regulator.c
+++ b/drivers/regulator/bd71828-regulator.c
@@ -11,7 +11,6 @@
 #include <linux/mfd/rohm-bd71828.h>
 #include <linux/mfd/rohm-bd72720.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/regulator/max77541-regulator.c b/drivers/regulator/max77541-regulator.c
index f2365930e9a9..09094a270c5a 100644
--- a/drivers/regulator/max77541-regulator.c
+++ b/drivers/regulator/max77541-regulator.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/mfd/max77541.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>
diff --git a/drivers/regulator/max77675-regulator.c b/drivers/regulator/max77675-regulator.c
index af3eb7174875..fad0844f364e 100644
--- a/drivers/regulator/max77675-regulator.c
+++ b/drivers/regulator/max77675-regulator.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/cleanup.h>
 #include <linux/slab.h>
 #include <linux/of.h>
diff --git a/drivers/regulator/mt6370-regulator.c b/drivers/regulator/mt6370-regulator.c
index a4ac4a42c108..6997beb51409 100644
--- a/drivers/regulator/mt6370-regulator.c
+++ b/drivers/regulator/mt6370-regulator.c
@@ -4,7 +4,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88080-regulator.c
index 9fe539a34786..112eb1c73647 100644
--- a/drivers/regulator/pv88080-regulator.c
+++ b/drivers/regulator/pv88080-regulator.c
@@ -5,7 +5,6 @@
 
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/init.h>
diff --git a/drivers/regulator/rt4803.c b/drivers/regulator/rt4803.c
index c96fb026dc10..34cd3f249ada 100644
--- a/drivers/regulator/rt4803.c
+++ b/drivers/regulator/rt4803.c
@@ -7,7 +7,6 @@
 
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/regulator/rt5739.c b/drivers/regulator/rt5739.c
index 5fcddd7c2da7..00706cba9f9e 100644
--- a/drivers/regulator/rt5739.c
+++ b/drivers/regulator/rt5739.c
@@ -11,7 +11,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>
diff --git a/drivers/regulator/rt6190-regulator.c b/drivers/regulator/rt6190-regulator.c
index 3883440295ed..f2cd9540038d 100644
--- a/drivers/regulator/rt6190-regulator.c
+++ b/drivers/regulator/rt6190-regulator.c
@@ -12,7 +12,6 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/drivers/regulator/rt8092.c b/drivers/regulator/rt8092.c
index 558bd04a2090..2ea4872ad8e0 100644
--- a/drivers/regulator/rt8092.c
+++ b/drivers/regulator/rt8092.c
@@ -8,7 +8,6 @@
 #include <linux/bits.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/regulator/rtq2208-regulator.c b/drivers/regulator/rtq2208-regulator.c
index f669a562f036..4fe111aa018f 100644
--- a/drivers/regulator/rtq2208-regulator.c
+++ b/drivers/regulator/rtq2208-regulator.c
@@ -9,7 +9,6 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/of_regulator.h>
-#include <linux/mod_devicetable.h>
 
 /* Register */
 #define RTQ2208_REG_GLOBAL_INT1			0x12
diff --git a/drivers/regulator/tps6287x-regulator.c b/drivers/regulator/tps6287x-regulator.c
index 7b7d3ae39206..9df104cb6bd2 100644
--- a/drivers/regulator/tps6287x-regulator.c
+++ b/drivers/regulator/tps6287x-regulator.c
@@ -8,7 +8,6 @@
 
 #include <linux/err.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/of_regulator.h>
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index 8df81ceeb845..00e5c3621fd8 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/init.h>
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 4317ec62f18f..a73aa3e0d5c5 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 
diff --git a/drivers/regulator/vexpress-regulator.c b/drivers/regulator/vexpress-regulator.c
index 6687077e9a97..5a2e0143cfdf 100644
--- a/drivers/regulator/vexpress-regulator.c
+++ b/drivers/regulator/vexpress-regulator.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/reset/reset-ath79.c b/drivers/reset/reset-ath79.c
index 4c4e69eb32bb..1a2c0f8a5e9e 100644
--- a/drivers/reset/reset-ath79.c
+++ b/drivers/reset/reset-ath79.c
@@ -8,7 +8,6 @@
 
 #include <linux/io.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 #include <linux/reboot.h>
diff --git a/drivers/reset/reset-axs10x.c b/drivers/reset/reset-axs10x.c
index 115f69e0db33..ea0e6b0b6b4d 100644
--- a/drivers/reset/reset-axs10x.c
+++ b/drivers/reset/reset-axs10x.c
@@ -10,7 +10,6 @@
 
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 56518f7bfbb3..441d9dd76572 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 
diff --git a/drivers/reset/reset-eyeq.c b/drivers/reset/reset-eyeq.c
index 1a3857983897..7b9ab574bd65 100644
--- a/drivers/reset/reset-eyeq.c
+++ b/drivers/reset/reset-eyeq.c
@@ -95,7 +95,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/lockdep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/reset-controller.h>
diff --git a/drivers/reset/reset-gpio.c b/drivers/reset/reset-gpio.c
index 26aa2c3a2e68..bf95296a512e 100644
--- a/drivers/reset/reset-gpio.c
+++ b/drivers/reset/reset-gpio.c
@@ -2,7 +2,6 @@
 
 #include <linux/auxiliary_bus.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/reset-controller.h>
diff --git a/drivers/reset/reset-sunplus.c b/drivers/reset/reset-sunplus.c
index 58b087433759..c136a1f0767a 100644
--- a/drivers/reset/reset-sunplus.c
+++ b/drivers/reset/reset-sunplus.c
@@ -8,7 +8,6 @@
 
 #include <linux/io.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 #include <linux/reboot.h>
diff --git a/drivers/reset/reset-tn48m.c b/drivers/reset/reset-tn48m.c
index 130027291b6e..177ee5127a1e 100644
--- a/drivers/reset/reset-tn48m.c
+++ b/drivers/reset/reset-tn48m.c
@@ -9,7 +9,6 @@
 
 #include <linux/device.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/reset/starfive/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c
index 2a56f7fd4ba7..b178dc7d958e 100644
--- a/drivers/reset/starfive/reset-starfive-jh7100.c
+++ b/drivers/reset/starfive/reset-starfive-jh7100.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "reset-starfive-jh71x0.h"
diff --git a/drivers/rtc/rtc-88pm886.c b/drivers/rtc/rtc-88pm886.c
index 57e9b0a66eed..7160aacd67cb 100644
--- a/drivers/rtc/rtc-88pm886.c
+++ b/drivers/rtc/rtc-88pm886.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/limits.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 
diff --git a/drivers/rtc/rtc-cpcap.c b/drivers/rtc/rtc-cpcap.c
index c170345ac076..a7db3173d24c 100644
--- a/drivers/rtc/rtc-cpcap.c
+++ b/drivers/rtc/rtc-cpcap.c
@@ -16,7 +16,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c
index e956505a06fb..50ebffd00341 100644
--- a/drivers/rtc/rtc-cros-ec.c
+++ b/drivers/rtc/rtc-cros-ec.c
@@ -5,7 +5,6 @@
 // Author: Stephen Barber <smbarber@chromium.org>
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 7205c59ff729..7cf179fc24de 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -12,7 +12,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/kstrtox.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/rtc/ds1307.h>
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index dcdcdd06f30d..507c9f22036c 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
diff --git a/drivers/rtc/rtc-fsl-ftm-alarm.c b/drivers/rtc/rtc-fsl-ftm-alarm.c
index c8015f04c71f..dcb7ef663a78 100644
--- a/drivers/rtc/rtc-fsl-ftm-alarm.c
+++ b/drivers/rtc/rtc-fsl-ftm-alarm.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/fsl/ftm.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-ftrtc010.c b/drivers/rtc/rtc-ftrtc010.c
index 02608d378495..98fa0f518303 100644
--- a/drivers/rtc/rtc-ftrtc010.c
+++ b/drivers/rtc/rtc-ftrtc010.c
@@ -17,7 +17,6 @@
 #include <linux/platform_device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/clk.h>
 
 #define DRV_NAME        "rtc-ftrtc010"
diff --git a/drivers/rtc/rtc-lpc24xx.c b/drivers/rtc/rtc-lpc24xx.c
index 2dcdc77ff646..a1266986dead 100644
--- a/drivers/rtc/rtc-lpc24xx.c
+++ b/drivers/rtc/rtc-lpc24xx.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 10cd054fe86f..db3bdb171ff0 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index 2494d13fd767..7960d5fa8cf0 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -10,7 +10,6 @@
 #include <linux/platform_device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/rtc.h>
 
diff --git a/drivers/rtc/rtc-moxart.c b/drivers/rtc/rtc-moxart.c
index 2247dd39ee4b..bc0345db6ed6 100644
--- a/drivers/rtc/rtc-moxart.c
+++ b/drivers/rtc/rtc-moxart.c
@@ -17,7 +17,6 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/gpio/consumer.h>
 
 #define GPIO_RTC_RESERVED			0x0C
diff --git a/drivers/rtc/rtc-msc313.c b/drivers/rtc/rtc-msc313.c
index 8d7737e0e2e0..a88d1a037172 100644
--- a/drivers/rtc/rtc-msc313.c
+++ b/drivers/rtc/rtc-msc313.c
@@ -12,7 +12,6 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 
diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
index 692c00ff544b..3d857681f760 100644
--- a/drivers/rtc/rtc-mt6397.c
+++ b/drivers/rtc/rtc-mt6397.c
@@ -14,7 +14,6 @@
 #include <linux/regmap.h>
 #include <linux/rtc.h>
 #include <linux/mfd/mt6397/rtc.h>
-#include <linux/mod_devicetable.h>
 
 static int mtk_rtc_write_trigger(struct mt6397_rtc *rtc)
 {
diff --git a/drivers/rtc/rtc-mt7622.c b/drivers/rtc/rtc-mt7622.c
index 4cf0cbb31a31..9e17dd09d567 100644
--- a/drivers/rtc/rtc-mt7622.c
+++ b/drivers/rtc/rtc-mt7622.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c
index 570f27af4732..a07acbbcfaeb 100644
--- a/drivers/rtc/rtc-mxc_v2.c
+++ b/drivers/rtc/rtc-mxc_v2.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_wakeirq.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-r7301.c b/drivers/rtc/rtc-r7301.c
index ef913cf8593f..6323b777151f 100644
--- a/drivers/rtc/rtc-r7301.c
+++ b/drivers/rtc/rtc-r7301.c
@@ -12,7 +12,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/delay.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/rtc/rtc-rzn1.c b/drivers/rtc/rtc-rzn1.c
index c4ed43735457..305f10a8a85b 100644
--- a/drivers/rtc/rtc-rzn1.c
+++ b/drivers/rtc/rtc-rzn1.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 0510dc64c3e2..7a5feceb9ee7 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -13,7 +13,6 @@
  *  Copyright (C) 1999  Tetsuya Okada & Niibe Yutaka
  */
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/kernel.h>
 #include <linux/bcd.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-ssd202d.c b/drivers/rtc/rtc-ssd202d.c
index ed6493260096..72aa02eb86ea 100644
--- a/drivers/rtc/rtc-ssd202d.c
+++ b/drivers/rtc/rtc-ssd202d.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/regmap.h>
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index 528e32b7d101..f16405c3911c 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -12,7 +12,6 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-ti-k3.c b/drivers/rtc/rtc-ti-k3.c
index e801f5b9d757..8df00319cb6b 100644
--- a/drivers/rtc/rtc-ti-k3.c
+++ b/drivers/rtc/rtc-ti-k3.c
@@ -7,7 +7,6 @@
 
 #include <linux/clk.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/rtc/rtc-tps6594.c b/drivers/rtc/rtc-tps6594.c
index 7c6246e3f029..c9de5c0bae43 100644
--- a/drivers/rtc/rtc-tps6594.c
+++ b/drivers/rtc/rtc-tps6594.c
@@ -14,7 +14,6 @@
 #include <linux/math64.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/rtc.h>
 #include <linux/types.h>
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 6a7497db5fb9..907265f3ad31 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -36,7 +36,7 @@
 #include <linux/ktime.h>
 #include <asm/facility.h>
 #include <linux/crypto.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ap.h>
 #include <linux/debugfs.h>
 #include <linux/ctype.h>
 #include <linux/module.h>
diff --git a/drivers/s390/crypto/vfio_ap_drv.c b/drivers/s390/crypto/vfio_ap_drv.c
index fd7394d81880..cdd6cdb8f61d 100644
--- a/drivers/s390/crypto/vfio_ap_drv.c
+++ b/drivers/s390/crypto/vfio_ap_drv.c
@@ -9,7 +9,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ap.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <asm/facility.h>
diff --git a/drivers/s390/crypto/zcrypt_cex4.c b/drivers/s390/crypto/zcrypt_cex4.c
index d307f40706e8..3d7cf5774599 100644
--- a/drivers/s390/crypto/zcrypt_cex4.c
+++ b/drivers/s390/crypto/zcrypt_cex4.c
@@ -11,7 +11,7 @@
 #include <linux/err.h>
 #include <linux/atomic.h>
 #include <linux/uaccess.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/ap.h>
 
 #include "ap_bus.h"
 #include "zcrypt_api.h"
diff --git a/drivers/siox/siox-bus-gpio.c b/drivers/siox/siox-bus-gpio.c
index 413d5f92311c..a0b62397e972 100644
--- a/drivers/siox/siox-bus-gpio.c
+++ b/drivers/siox/siox-bus-gpio.c
@@ -5,7 +5,6 @@
 
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <linux/delay.h>
diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c
index 3ecc4ce9cfa2..5fdf1fe4edaf 100644
--- a/drivers/soc/fsl/qe/qe.c
+++ b/drivers/soc/fsl/qe/qe.c
@@ -24,7 +24,6 @@
 #include <linux/ioport.h>
 #include <linux/iopoll.h>
 #include <linux/crc32.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <soc/fsl/qe/immap_qe.h>
diff --git a/drivers/soc/qcom/qcom_pd_mapper.c b/drivers/soc/qcom/qcom_pd_mapper.c
index b99718e25f2f..0dc1a7946050 100644
--- a/drivers/soc/qcom/qcom_pd_mapper.c
+++ b/drivers/soc/qcom/qcom_pd_mapper.c
@@ -7,7 +7,6 @@
 
 #include <linux/auxiliary_bus.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/refcount.h>
diff --git a/drivers/soc/renesas/rzn1_irqmux.c b/drivers/soc/renesas/rzn1_irqmux.c
index b50b295f83d7..c3887db7afd1 100644
--- a/drivers/soc/renesas/rzn1_irqmux.c
+++ b/drivers/soc/renesas/rzn1_irqmux.c
@@ -8,7 +8,6 @@
 
 #include <linux/bitmap.h>
 #include <linux/bitops.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
diff --git a/drivers/soc/sophgo/sg2044-topsys.c b/drivers/soc/sophgo/sg2044-topsys.c
index 179f2620b2a9..36c90751b5ae 100644
--- a/drivers/soc/sophgo/sg2044-topsys.c
+++ b/drivers/soc/sophgo/sg2044-topsys.c
@@ -6,7 +6,7 @@
  */
 
 #include <linux/mfd/core.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/resource.h>
diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
index 071cd9620634..78b054d43a42 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
@@ -9,7 +9,6 @@
 #include <linux/kobject.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/nvmem-consumer.h>
 #include <linux/nvmem-provider.h>
 #include <linux/of.h>
diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c
index 87ae63a7e52d..5b0e9dae231f 100644
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
+++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@ -8,7 +8,6 @@
 #include <linux/export.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 
diff --git a/drivers/soc/ti/smartreflex.c b/drivers/soc/ti/smartreflex.c
index ced3a73929e3..5e0d040859a6 100644
--- a/drivers/soc/ti/smartreflex.c
+++ b/drivers/soc/ti/smartreflex.c
@@ -15,7 +15,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/of.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
 #include <linux/io.h>
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index b7bdf19ebb42..6848070ce666 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -3,7 +3,6 @@
 
 #include <linux/acpi.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/soundwire/sdw.h>
diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
index a05aa36828cb..e73c1bea9059 100644
--- a/drivers/soundwire/bus_type.c
+++ b/drivers/soundwire/bus_type.c
@@ -2,7 +2,6 @@
 // Copyright(c) 2015-17 Intel Corporation.
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_domain.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index b8b62735c893..eb66345a6a42 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/soundwire/sdw.h>
diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c
index 2905ec19b838..099eb84a548e 100644
--- a/drivers/soundwire/debugfs.c
+++ b/drivers/soundwire/debugfs.c
@@ -5,7 +5,6 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 #include <linux/firmware.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/soundwire/sdw.h>
diff --git a/drivers/soundwire/generic_bandwidth_allocation.c b/drivers/soundwire/generic_bandwidth_allocation.c
index fb3970e12dac..e356884cd43d 100644
--- a/drivers/soundwire/generic_bandwidth_allocation.c
+++ b/drivers/soundwire/generic_bandwidth_allocation.c
@@ -9,7 +9,6 @@
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/soundwire/sdw.h>
 #include "bus.h"
diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c
index c69b78cd0b62..fdbf51f2bb77 100644
--- a/drivers/soundwire/mipi_disco.c
+++ b/drivers/soundwire/mipi_disco.c
@@ -19,7 +19,6 @@
 
 #include <linux/device.h>
 #include <linux/property.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw.h>
 #include "bus.h"
 
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 4ed8fb7663ad..1cae0450ab18 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -10,7 +10,6 @@
 #include <linux/init.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/soundwire/sdw.h>
diff --git a/drivers/soundwire/sysfs_slave.c b/drivers/soundwire/sysfs_slave.c
index c5c22d1708ec..a2ee064147e0 100644
--- a/drivers/soundwire/sysfs_slave.c
+++ b/drivers/soundwire/sysfs_slave.c
@@ -2,7 +2,6 @@
 // Copyright(c) 2015-2020 Intel Corporation.
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/soundwire/sdw.h>
diff --git a/drivers/soundwire/sysfs_slave_dpn.c b/drivers/soundwire/sysfs_slave_dpn.c
index a3fb380ee519..d2561400da77 100644
--- a/drivers/soundwire/sysfs_slave_dpn.c
+++ b/drivers/soundwire/sysfs_slave_dpn.c
@@ -2,7 +2,6 @@
 // Copyright(c) 2015-2020 Intel Corporation.
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/soundwire/sdw.h>
diff --git a/drivers/spi/spi-atcspi200.c b/drivers/spi/spi-atcspi200.c
index 6d4b6aeb3f5b..3c5098421ba3 100644
--- a/drivers/spi/spi-atcspi200.c
+++ b/drivers/spi/spi-atcspi200.c
@@ -15,7 +15,6 @@
 #include <linux/jiffies.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c
index 6961e36b89d1..7106a8a4f280 100644
--- a/drivers/spi/spi-cs42l43.c
+++ b/drivers/spi/spi-cs42l43.c
@@ -17,7 +17,6 @@
 #include <linux/gpio/property.h>
 #include <linux/mfd/cs42l43.h>
 #include <linux/mfd/cs42l43-regs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 072127a38fad..c32c33b27e1a 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -7,7 +7,6 @@
  */
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/spi/spi-hisi-sfc-v3xx.c b/drivers/spi/spi-hisi-sfc-v3xx.c
index eeeb86381862..d60db579b0fb 100644
--- a/drivers/spi/spi-hisi-sfc-v3xx.c
+++ b/drivers/spi/spi-hisi-sfc-v3xx.c
@@ -11,7 +11,6 @@
 #include <linux/interrupt.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/spi/spi-loongson-pci.c b/drivers/spi/spi-loongson-pci.c
index cbcde153260e..2fe5419a8dd2 100644
--- a/drivers/spi/spi-loongson-pci.c
+++ b/drivers/spi/spi-loongson-pci.c
@@ -2,7 +2,6 @@
 // PCI interface driver for Loongson SPI Support
 // Copyright (C) 2023 Loongson Technology Corporation Limited
 
-#include <linux/mod_devicetable.h>
 #include <linux/pci.h>
 
 #include "spi-loongson.h"
diff --git a/drivers/spi/spi-loongson-plat.c b/drivers/spi/spi-loongson-plat.c
index 64a7270f9a64..550b237838c0 100644
--- a/drivers/spi/spi-loongson-plat.c
+++ b/drivers/spi/spi-loongson-plat.c
@@ -3,7 +3,6 @@
 // Copyright (C) 2023 Loongson Technology Corporation Limited
 
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "spi-loongson.h"
diff --git a/drivers/spi/spi-loopback-test.c b/drivers/spi/spi-loopback-test.c
index e0b131aa29b6..066386abadac 100644
--- a/drivers/spi/spi-loopback-test.c
+++ b/drivers/spi/spi-loopback-test.c
@@ -14,7 +14,6 @@
 #include <linux/ktime.h>
 #include <linux/list.h>
 #include <linux/list_sort.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/printk.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/spi/spi-offload-trigger-adi-util-sigma-delta.c b/drivers/spi/spi-offload-trigger-adi-util-sigma-delta.c
index 8468c773713a..c4c25c2cc4b5 100644
--- a/drivers/spi/spi-offload-trigger-adi-util-sigma-delta.c
+++ b/drivers/spi/spi-offload-trigger-adi-util-sigma-delta.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/dev_printk.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/spi/spi-offload-trigger-pwm.c b/drivers/spi/spi-offload-trigger-pwm.c
index 3e8c19227edb..0eff14328a6b 100644
--- a/drivers/spi/spi-offload-trigger-pwm.c
+++ b/drivers/spi/spi-offload-trigger-pwm.c
@@ -9,7 +9,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/spi/spi-pxa2xx-platform.c b/drivers/spi/spi-pxa2xx-platform.c
index 45e159e75a52..849a14cd0343 100644
--- a/drivers/spi/spi-pxa2xx-platform.c
+++ b/drivers/spi/spi-pxa2xx-platform.c
@@ -5,7 +5,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/drivers/spi/spi-realtek-rtl-snand.c b/drivers/spi/spi-realtek-rtl-snand.c
index 7d5853d202c6..61fe54d8167a 100644
--- a/drivers/spi/spi-realtek-rtl-snand.c
+++ b/drivers/spi/spi-realtek-rtl-snand.c
@@ -3,7 +3,6 @@
 #include <linux/completion.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/spi/spi-realtek-rtl.c b/drivers/spi/spi-realtek-rtl.c
index d7acc02105ca..73065c8934dc 100644
--- a/drivers/spi/spi-realtek-rtl.c
+++ b/drivers/spi/spi-realtek-rtl.c
@@ -2,7 +2,6 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 
 struct rtspi {
diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c
index ae534ebd5e87..ebd5c172efda 100644
--- a/drivers/spi/spi-sc18is602.c
+++ b/drivers/spi/spi-sc18is602.c
@@ -7,7 +7,6 @@
 
 #include <linux/kernel.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
diff --git a/drivers/spi/spi-wpcm-fiu.c b/drivers/spi/spi-wpcm-fiu.c
index cd78e927953d..884e5042bad5 100644
--- a/drivers/spi/spi-wpcm-fiu.c
+++ b/drivers/spi/spi-wpcm-fiu.c
@@ -3,7 +3,6 @@
 
 #include <linux/clk.h>
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 76e3563c523f..8f9c740feb8a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -19,7 +19,6 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 638221178384..15d2aaeb08e9 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -14,7 +14,6 @@
 #include <linux/err.h>
 #include <linux/list.h>
 #include <linux/errno.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/property.h>
diff --git a/drivers/spmi/spmi-apple-controller.c b/drivers/spmi/spmi-apple-controller.c
index 87e3ee9d4f2a..376cf682c43e 100644
--- a/drivers/spmi/spmi-apple-controller.c
+++ b/drivers/spmi/spmi-apple-controller.c
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/spmi.h>
 
diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c
index 19a6e59b6d5c..4302c2226126 100644
--- a/drivers/staging/greybus/arche-apb-ctrl.c
+++ b/drivers/staging/greybus/arche-apb-ctrl.c
@@ -17,7 +17,6 @@
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spinlock.h>
-#include <linux/mod_devicetable.h>
 #include "arche_platform.h"
 
 static void apb_bootret_deassert(struct device *dev);
diff --git a/drivers/thermal/loongson2_thermal.c b/drivers/thermal/loongson2_thermal.c
index ea4dd2fb1f47..88f87badfdf6 100644
--- a/drivers/thermal/loongson2_thermal.c
+++ b/drivers/thermal/loongson2_thermal.c
@@ -8,7 +8,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/thermal/renesas/rzg2l_thermal.c b/drivers/thermal/renesas/rzg2l_thermal.c
index b588be628640..d9afd0619167 100644
--- a/drivers/thermal/renesas/rzg2l_thermal.c
+++ b/drivers/thermal/renesas/rzg2l_thermal.c
@@ -9,7 +9,6 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index 12d08de59095..16edd71a0d8d 100644
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -13,7 +13,6 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/goldfish.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/tty/serial/8250/8250_dfl.c b/drivers/tty/serial/8250/8250_dfl.c
index 6c5ff019df4b..475ca340948c 100644
--- a/drivers/tty/serial/8250/8250_dfl.c
+++ b/drivers/tty/serial/8250/8250_dfl.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 
 #include <linux/serial.h>
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 2af0c4d0ad82..3352a3ca9360 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -17,7 +17,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/lockdep.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/platform_device.h>
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index e90c71494944..32d077da076a 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/serial_8250.h>
 #include <linux/serial_reg.h>
 #include <linux/platform_device.h>
diff --git a/drivers/tty/serial/8250/8250_keba.c b/drivers/tty/serial/8250/8250_keba.c
index f94d97e69dc5..5b791b6eefd0 100644
--- a/drivers/tty/serial/8250/8250_keba.c
+++ b/drivers/tty/serial/8250/8250_keba.c
@@ -13,7 +13,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/misc/keba.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/serial_core.h>
 #include <linux/spinlock.h>
diff --git a/drivers/tty/serial/8250/8250_loongson.c b/drivers/tty/serial/8250/8250_loongson.c
index 47df3c4c9d21..19acb2c6b611 100644
--- a/drivers/tty/serial/8250/8250_loongson.c
+++ b/drivers/tty/serial/8250/8250_loongson.c
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/property.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/reset.h>
 
diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c
index 0935341dd050..9f945f8ed1de 100644
--- a/drivers/tty/serial/8250/8250_ni.c
+++ b/drivers/tty/serial/8250/8250_ni.c
@@ -16,7 +16,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index 475b0a6efce4..44b745fa26c6 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -21,7 +21,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/freezer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/property.h>
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index ac7d3f197c3a..ccf1fcbdd56f 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -16,7 +16,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/serial_core.h>
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 1fd64a47341d..daebd92f32c7 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -20,7 +20,6 @@
 #include <linux/gpio/driver.h>
 #include <linux/idr.h>
 #include <linux/kthread.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
diff --git a/drivers/tty/serial/sc16is7xx_i2c.c b/drivers/tty/serial/sc16is7xx_i2c.c
index 699376c3b3a5..00c7b3bd1002 100644
--- a/drivers/tty/serial/sc16is7xx_i2c.c
+++ b/drivers/tty/serial/sc16is7xx_i2c.c
@@ -3,7 +3,6 @@
 
 #include <linux/dev_printk.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/string.h>
diff --git a/drivers/tty/serial/sc16is7xx_spi.c b/drivers/tty/serial/sc16is7xx_spi.c
index 7e76d0e38da7..96fde93ae446 100644
--- a/drivers/tty/serial/sc16is7xx_spi.c
+++ b/drivers/tty/serial/sc16is7xx_spi.c
@@ -2,7 +2,6 @@
 /* SC16IS7xx SPI interface driver */
 
 #include <linux/dev_printk.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index 4ceca11ce600..cb31e3aceb62 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -11,7 +11,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/device.h>
 #include <linux/console.h>
 #include <linux/serial_core.h>
diff --git a/drivers/tty/serial/tegra-utc.c b/drivers/tty/serial/tegra-utc.c
index 0c70d3e7b9b9..3d43c11824ca 100644
--- a/drivers/tty/serial/tegra-utc.c
+++ b/drivers/tty/serial/tegra-utc.c
@@ -10,7 +10,6 @@
 #include <linux/iopoll.h>
 #include <linux/kfifo.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/platform_device.h>
 #include <linux/serial.h>
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 0a1885d1b2e3..0c8d73e7be52 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -23,7 +23,6 @@
 #include <linux/irq.h>
 
 #include <linux/of.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 
 #define DRIVER_NAME "uio_pdrv_genirq"
diff --git a/drivers/usb/gadget/udc/renesas_usbf.c b/drivers/usb/gadget/udc/renesas_usbf.c
index 5d510665da1f..d67002ea049a 100644
--- a/drivers/usb/gadget/udc/renesas_usbf.c
+++ b/drivers/usb/gadget/udc/renesas_usbf.c
@@ -12,7 +12,6 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/kfifo.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/drivers/usb/misc/usb-ljca.c b/drivers/usb/misc/usb-ljca.c
index c60121faa3da..78e94dd89da5 100644
--- a/drivers/usb/misc/usb-ljca.c
+++ b/drivers/usb/misc/usb-ljca.c
@@ -9,7 +9,6 @@
 #include <linux/auxiliary_bus.h>
 #include <linux/dev_printk.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/typec/mux/tusb1046.c b/drivers/usb/typec/mux/tusb1046.c
index 3c1a4551c2fb..d6e1289a4945 100644
--- a/drivers/usb/typec/mux/tusb1046.c
+++ b/drivers/usb/typec/mux/tusb1046.c
@@ -11,7 +11,6 @@
 #include <linux/usb/typec_dp.h>
 #include <linux/usb/typec_altmode.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/of_device.h>
 #include <linux/device.h>
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
index 3766790c1548..bd1f2757736a 100644
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
index c8b1463e6e8b..e6b28648f440 100644
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
index 8fac171778da..01b310549c8c 100644
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
@@ -6,7 +6,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
index 8051eaa46991..e6258b9efc4b 100644
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/drivers/usb/typec/tcpm/tcpci_mt6370.c b/drivers/usb/typec/tcpm/tcpci_mt6370.c
index ed822f438a09..7d6c75c70985 100644
--- a/drivers/usb/typec/tcpm/tcpci_mt6370.c
+++ b/drivers/usb/typec/tcpm/tcpci_mt6370.c
@@ -8,7 +8,6 @@
 #include <linux/bits.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_wakeirq.h>
diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
index 4b3e4e22a82e..159d9d372d98 100644
--- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c
+++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
@@ -8,7 +8,6 @@
 #include <linux/bitfield.h>
 #include <linux/bits.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
diff --git a/drivers/usb/typec/ucsi/cros_ec_ucsi.c b/drivers/usb/typec/ucsi/cros_ec_ucsi.c
index 251aa7251ce6..ec8483509b60 100644
--- a/drivers/usb/typec/ucsi/cros_ec_ucsi.c
+++ b/drivers/usb/typec/ucsi/cros_ec_ucsi.c
@@ -9,7 +9,6 @@
 #include <linux/container_of.h>
 #include <linux/dev_printk.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_data/cros_ec_commands.h>
diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index caf0ee5d6856..47c6c3d23f5c 100644
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -13,7 +13,6 @@
 #include <linux/vdpa.h>
 #include <uapi/linux/vdpa.h>
 #include <net/genetlink.h>
-#include <linux/mod_devicetable.h>
 #include <linux/virtio_ids.h>
 
 static LIST_HEAD(mdev_head);
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index f15ad425e01f..10dcf016bfb0 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -32,7 +32,6 @@
 #include <uapi/linux/virtio_ids.h>
 #include <uapi/linux/virtio_blk.h>
 #include <uapi/linux/virtio_ring.h>
-#include <linux/mod_devicetable.h>
 
 #include "iova_domain.h"
 
diff --git a/drivers/video/backlight/apple_dwi_bl.c b/drivers/video/backlight/apple_dwi_bl.c
index ed8bf13d3f51..93bd744972d6 100644
--- a/drivers/video/backlight/apple_dwi_bl.c
+++ b/drivers/video/backlight/apple_dwi_bl.c
@@ -9,7 +9,6 @@
 #include <linux/bitfield.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
index 2493138febfa..f41523d78121 100644
--- a/drivers/video/backlight/da9052_bl.c
+++ b/drivers/video/backlight/da9052_bl.c
@@ -9,7 +9,6 @@
 
 #include <linux/backlight.h>
 #include <linux/delay.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/drivers/video/backlight/hx8357.c b/drivers/video/backlight/hx8357.c
index 61a57d38700f..590365c6a51b 100644
--- a/drivers/video/backlight/hx8357.c
+++ b/drivers/video/backlight/hx8357.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/lcd.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
diff --git a/drivers/video/backlight/ktd2801-backlight.c b/drivers/video/backlight/ktd2801-backlight.c
index 1b1307e03b20..02baf3a60b2a 100644
--- a/drivers/video/backlight/ktd2801-backlight.c
+++ b/drivers/video/backlight/ktd2801-backlight.c
@@ -6,7 +6,6 @@
 #include <linux/backlight.h>
 #include <linux/gpio/consumer.h>
 #include <linux/leds-expresswire.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
diff --git a/drivers/video/backlight/mp3309c.c b/drivers/video/backlight/mp3309c.c
index 413cfe27dfd9..752a45798bfc 100644
--- a/drivers/video/backlight/mp3309c.c
+++ b/drivers/video/backlight/mp3309c.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/pwm.h>
 #include <linux/regmap.h>
diff --git a/drivers/video/backlight/mt6370-backlight.c b/drivers/video/backlight/mt6370-backlight.c
index e55f26888d0f..7905372c2a4c 100644
--- a/drivers/video/backlight/mt6370-backlight.c
+++ b/drivers/video/backlight/mt6370-backlight.c
@@ -11,7 +11,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/video/backlight/rave-sp-backlight.c b/drivers/video/backlight/rave-sp-backlight.c
index bfe01b9b9174..b7528ef02119 100644
--- a/drivers/video/backlight/rave-sp-backlight.c
+++ b/drivers/video/backlight/rave-sp-backlight.c
@@ -9,7 +9,6 @@
 
 #include <linux/backlight.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mfd/rave-sp.h>
 #include <linux/of.h>
diff --git a/drivers/video/backlight/rt4831-backlight.c b/drivers/video/backlight/rt4831-backlight.c
index 26214519bfce..7ead75929a43 100644
--- a/drivers/video/backlight/rt4831-backlight.c
+++ b/drivers/video/backlight/rt4831-backlight.c
@@ -4,7 +4,6 @@
 #include <linux/backlight.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
index f4e7ed943b8a..8423d90313da 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
@@ -13,7 +13,6 @@
 
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
index 458e65771cbb..881c8f1ad7a8 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
index 8cf0cb922f3c..635375e9080c 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
@@ -9,7 +9,6 @@
 #include <linux/completion.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
index 1d75f27c6b80..5e7963b4aa93 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
@@ -15,7 +15,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/sched/signal.h>
diff --git a/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c b/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c
index 66d00b6ceb78..0b2488f31ec2 100644
--- a/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c
+++ b/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c
@@ -6,7 +6,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/cc_platform.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/platform.h>
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/tsm.h>
diff --git a/drivers/virt/coco/tdx-guest/tdx-guest.c b/drivers/virt/coco/tdx-guest/tdx-guest.c
index a9ecc46df187..d0303e31e816 100644
--- a/drivers/virt/coco/tdx-guest/tdx-guest.c
+++ b/drivers/virt/coco/tdx-guest/tdx-guest.c
@@ -11,7 +11,6 @@
 #include <linux/miscdevice.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/set_memory.h>
diff --git a/drivers/virt/coco/tdx-host/tdx-host.c b/drivers/virt/coco/tdx-host/tdx-host.c
index d48952968e86..e8ed8dfa526e 100644
--- a/drivers/virt/coco/tdx-host/tdx-host.c
+++ b/drivers/virt/coco/tdx-host/tdx-host.c
@@ -8,7 +8,6 @@
 #include <linux/device/faux.h>
 #include <linux/firmware.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/sysfs.h>
 
 #include <asm/cpu_device_id.h>
diff --git a/drivers/w1/masters/amd_axi_w1.c b/drivers/w1/masters/amd_axi_w1.c
index 5da8b8d86811..96d986e0f58d 100644
--- a/drivers/w1/masters/amd_axi_w1.c
+++ b/drivers/w1/masters/amd_axi_w1.c
@@ -12,7 +12,6 @@
 #include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c
index aa1f57f74397..3cbff88c339e 100644
--- a/drivers/w1/masters/ds2490.c
+++ b/drivers/w1/masters/ds2490.c
@@ -7,7 +7,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/usb.h>
 #include <linux/slab.h>
 
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 30a190ce4298..761dcbdd732a 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -9,7 +9,6 @@
 #include <linux/io.h>
 #include <linux/ktime.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include <linux/w1.h>
diff --git a/drivers/w1/masters/sgi_w1.c b/drivers/w1/masters/sgi_w1.c
index af6b1186b763..48c10062022c 100644
--- a/drivers/w1/masters/sgi_w1.c
+++ b/drivers/w1/masters/sgi_w1.c
@@ -8,7 +8,6 @@
 #include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/sgi-w1.h>
 
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index a579f95be8f1..184aea37bfaf 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -9,7 +9,6 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 1795aaf1ec45..d5afcc634221 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -18,7 +18,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/mfd/syscon/atmel-st.h>
 #include <linux/miscdevice.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/cros_ec_wdt.c b/drivers/watchdog/cros_ec_wdt.c
index 9ffe7f505645..9a4a59b39ed9 100644
--- a/drivers/watchdog/cros_ec_wdt.c
+++ b/drivers/watchdog/cros_ec_wdt.c
@@ -7,7 +7,6 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 5f2184bda7b2..6ea0434f45c2 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -11,7 +11,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c
index 28f5af752c10..67f16b34a25f 100644
--- a/drivers/watchdog/ftwdt010_wdt.c
+++ b/drivers/watchdog/ftwdt010_wdt.c
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index a7b814ea740b..1abc7d0b78a6 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/watchdog/gunyah_wdt.c b/drivers/watchdog/gunyah_wdt.c
index 49dfef459e84..557a78306d18 100644
--- a/drivers/watchdog/gunyah_wdt.c
+++ b/drivers/watchdog/gunyah_wdt.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c
index a55f801895d4..65cc8396aa59 100644
--- a/drivers/watchdog/imgpdc_wdt.c
+++ b/drivers/watchdog/imgpdc_wdt.c
@@ -41,7 +41,6 @@
 #include <linux/io.h>
 #include <linux/log2.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c
index 2a39114dbc64..3854249c7455 100644
--- a/drivers/watchdog/keembay_wdt.c
+++ b/drivers/watchdog/keembay_wdt.c
@@ -12,7 +12,6 @@
 #include <linux/io.h>
 #include <linux/limits.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index 21935f9620e4..3b4f3134d1c4 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -14,7 +14,6 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c
index d3ced783a5f4..6ce435741d97 100644
--- a/drivers/watchdog/max77620_wdt.c
+++ b/drivers/watchdog/max77620_wdt.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mfd/max77620.h>
 #include <linux/mfd/max77714.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 497496f64f55..44db4ebc8599 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c
index b7b1da3c932d..1b68a1917003 100644
--- a/drivers/watchdog/moxart_wdt.c
+++ b/drivers/watchdog/moxart_wdt.c
@@ -11,7 +11,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/msc313e_wdt.c b/drivers/watchdog/msc313e_wdt.c
index 90171431fc59..d962589e2c55 100644
--- a/drivers/watchdog/msc313e_wdt.c
+++ b/drivers/watchdog/msc313e_wdt.c
@@ -9,7 +9,6 @@
 
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index 442731bba194..db47b131f780 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -14,7 +14,6 @@
 #include <linux/watchdog.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
diff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c
index 44b5298f599a..8169423801f0 100644
--- a/drivers/watchdog/nic7018_wdt.c
+++ b/drivers/watchdog/nic7018_wdt.c
@@ -6,7 +6,6 @@
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index d523428a8d22..95c7e44b7baa 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -27,7 +27,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
index 7f53b5293409..48d67f7c972a 100644
--- a/drivers/watchdog/pseries-wdt.c
+++ b/drivers/watchdog/pseries-wdt.c
@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 #include <linux/limits.h>
 #include <linux/math.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/realtek_otto_wdt.c b/drivers/watchdog/realtek_otto_wdt.c
index 01b3ef89bacf..9094f2189f55 100644
--- a/drivers/watchdog/realtek_otto_wdt.c
+++ b/drivers/watchdog/realtek_otto_wdt.c
@@ -24,7 +24,6 @@
 #include <linux/math.h>
 #include <linux/minmax.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/reboot.h>
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
index 4499ba0eb5ea..c8edd83bb502 100644
--- a/drivers/watchdog/rt2880_wdt.c
+++ b/drivers/watchdog/rt2880_wdt.c
@@ -15,7 +15,6 @@
 #include <linux/watchdog.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 
 #include <asm/mach-ralink/ralink_regs.h>
 
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index c3c7715140ea..7c1bd83b056a 100644
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -11,7 +11,6 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/of.h>
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 13933e12b754..e04d42cc7774 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -43,7 +43,6 @@
 #include <linux/io.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
diff --git a/drivers/watchdog/sl28cpld_wdt.c b/drivers/watchdog/sl28cpld_wdt.c
index 8630c29818f2..c0b5e5fff5d7 100644
--- a/drivers/watchdog/sl28cpld_wdt.c
+++ b/drivers/watchdog/sl28cpld_wdt.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
diff --git a/drivers/watchdog/sunplus_wdt.c b/drivers/watchdog/sunplus_wdt.c
index 9d3ca848e8b6..ae0c11a15a05 100644
--- a/drivers/watchdog/sunplus_wdt.c
+++ b/drivers/watchdog/sunplus_wdt.c
@@ -9,7 +9,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index ac709dc31a65..ede46a442b94 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/watchdog.h>
 #include <linux/io.h>
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 8c80d04811e4..69a622646d75 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/twl.h>
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index 3d2a156f7180..799ce8d22b2f 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -10,7 +10,6 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c
index 80e341d2f8a4..3990da1a65dc 100644
--- a/net/qrtr/mhi.c
+++ b/net/qrtr/mhi.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/mhi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index cf2dcec6ce5a..9c5b695dba7c 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -7,7 +7,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/rfkill.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index df0a049192de..e394205f469b 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -12,7 +12,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index 2b7f071d593b..18472b362a78 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -11,7 +11,6 @@
 #include <linux/firewire.h>
 #include <linux/firewire-constants.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/string.h>
 #include <sound/control.h>
diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c b/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c
index 96d8cc6c2324..fdf406e92fca 100644
--- a/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c
+++ b/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c
@@ -6,7 +6,6 @@
 //
 // Author: Lucas Tanure <tanureal@opensource.cirrus.com>
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
 
diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c b/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c
index 2acbaf8467a0..aab2066a20eb 100644
--- a/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c
+++ b/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c
@@ -6,7 +6,6 @@
 //
 // Author: Lucas Tanure <tanureal@opensource.cirrus.com>
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 
diff --git a/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c b/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
index 93bf12116626..69a22fdfeedb 100644
--- a/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
+++ b/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
@@ -14,7 +14,6 @@
 #include <linux/efi.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pci_ids.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/hda/codecs/side-codecs/tas2781_hda_spi.c b/sound/hda/codecs/side-codecs/tas2781_hda_spi.c
index 3978d58ad020..4899ea372798 100644
--- a/sound/hda/codecs/side-codecs/tas2781_hda_spi.c
+++ b/sound/hda/codecs/side-codecs/tas2781_hda_spi.c
@@ -14,7 +14,6 @@
 #include <linux/crc32.h>
 #include <linux/efi.h>
 #include <linux/firmware.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/hda/core/hda_bus_type.c b/sound/hda/core/hda_bus_type.c
index eb72a7af2e56..a6bf5a5a05bb 100644
--- a/sound/hda/core/hda_bus_type.c
+++ b/sound/hda/core/hda_bus_type.c
@@ -5,7 +5,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
+#include <linux/mod_device_id/hda.h>
 #include <linux/export.h>
 #include <sound/hdaudio.h>
 
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
index 1b5ef4e9d2b8..a603e4a57d50 100644
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -15,7 +15,6 @@
 #include <linux/of.h>
 #include <linux/export.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
 
diff --git a/sound/soc/codecs/adau1372-i2c.c b/sound/soc/codecs/adau1372-i2c.c
index 4217b7fc349c..bdb3e3a8509d 100644
--- a/sound/soc/codecs/adau1372-i2c.c
+++ b/sound/soc/codecs/adau1372-i2c.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
diff --git a/sound/soc/codecs/adau1372-spi.c b/sound/soc/codecs/adau1372-spi.c
index 656bd1fabeb3..a12961e2fb1e 100644
--- a/sound/soc/codecs/adau1372-spi.c
+++ b/sound/soc/codecs/adau1372-spi.c
@@ -6,7 +6,6 @@
  *  Author: Lars-Peter Clausen <lars@metafoo.de>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/sound/soc/codecs/adau1372.c b/sound/soc/codecs/adau1372.c
index 879afeb81c42..cc174ec3a1f8 100644
--- a/sound/soc/codecs/adau1372.c
+++ b/sound/soc/codecs/adau1372.c
@@ -11,7 +11,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
 
diff --git a/sound/soc/codecs/adau1761-i2c.c b/sound/soc/codecs/adau1761-i2c.c
index a329e5bddb99..ae73136d0a6e 100644
--- a/sound/soc/codecs/adau1761-i2c.c
+++ b/sound/soc/codecs/adau1761-i2c.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
diff --git a/sound/soc/codecs/adau1761-spi.c b/sound/soc/codecs/adau1761-spi.c
index 7c9242c2ff94..eb6f63d63783 100644
--- a/sound/soc/codecs/adau1761-spi.c
+++ b/sound/soc/codecs/adau1761-spi.c
@@ -6,7 +6,6 @@
  *  Author: Lars-Peter Clausen <lars@metafoo.de>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/sound/soc/codecs/adau1781-i2c.c b/sound/soc/codecs/adau1781-i2c.c
index 0e7954148af7..3ab624417f12 100644
--- a/sound/soc/codecs/adau1781-i2c.c
+++ b/sound/soc/codecs/adau1781-i2c.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
diff --git a/sound/soc/codecs/adau1781-spi.c b/sound/soc/codecs/adau1781-spi.c
index 1a09633d5a88..0e6d42b10077 100644
--- a/sound/soc/codecs/adau1781-spi.c
+++ b/sound/soc/codecs/adau1781-spi.c
@@ -6,7 +6,6 @@
  *  Author: Lars-Peter Clausen <lars@metafoo.de>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
diff --git a/sound/soc/codecs/adau1977-i2c.c b/sound/soc/codecs/adau1977-i2c.c
index fc7ed5c1dd74..d1c6c4ddf506 100644
--- a/sound/soc/codecs/adau1977-i2c.c
+++ b/sound/soc/codecs/adau1977-i2c.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
diff --git a/sound/soc/codecs/adau1977-spi.c b/sound/soc/codecs/adau1977-spi.c
index e7e95e5d1911..878cde9d1014 100644
--- a/sound/soc/codecs/adau1977-spi.c
+++ b/sound/soc/codecs/adau1977-spi.c
@@ -6,7 +6,6 @@
  *  Author: Lars-Peter Clausen <lars@metafoo.de>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/of.h>
diff --git a/sound/soc/codecs/adau7118-hw.c b/sound/soc/codecs/adau7118-hw.c
index 45a5d2dcc0f2..92b226b8b4bb 100644
--- a/sound/soc/codecs/adau7118-hw.c
+++ b/sound/soc/codecs/adau7118-hw.c
@@ -6,7 +6,6 @@
 // Copyright 2019 Analog Devices Inc.
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 
 #include "adau7118.h"
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index a33cb329865c..6ea7cb78cd44 100644
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
diff --git a/sound/soc/codecs/audio-iio-aux.c b/sound/soc/codecs/audio-iio-aux.c
index 066e401912b0..964b9a5b2990 100644
--- a/sound/soc/codecs/audio-iio-aux.c
+++ b/sound/soc/codecs/audio-iio-aux.c
@@ -9,7 +9,6 @@
 #include <linux/cleanup.h>
 #include <linux/iio/consumer.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/string_helpers.h>
diff --git a/sound/soc/codecs/cs4234.c b/sound/soc/codecs/cs4234.c
index 89c424dd838b..a889fbd519a8 100644
--- a/sound/soc/codecs/cs4234.c
+++ b/sound/soc/codecs/cs4234.c
@@ -11,7 +11,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/jiffies.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 47cb10eb21bb..47b2f903a32c 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -19,7 +19,6 @@
  * - Power management is supported
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <sound/core.h>
diff --git a/sound/soc/codecs/cs42l42-sdw.c b/sound/soc/codecs/cs42l42-sdw.c
index b8256ce0b8fb..ad1256910a18 100644
--- a/sound/soc/codecs/cs42l42-sdw.c
+++ b/sound/soc/codecs/cs42l42-sdw.c
@@ -9,7 +9,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of_irq.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw.h>
diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c
index f0d6ff0b2976..1d133577702e 100644
--- a/sound/soc/codecs/cs42l43.c
+++ b/sound/soc/codecs/cs42l43.c
@@ -19,7 +19,6 @@
 #include <linux/jiffies.h>
 #include <linux/mfd/cs42l43.h>
 #include <linux/mfd/cs42l43-regs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
index 31debe2d8231..4427d3214dee 100644
--- a/sound/soc/codecs/cs42xx8-i2c.c
+++ b/sound/soc/codecs/cs42xx8-i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <sound/soc.h>
 
diff --git a/sound/soc/codecs/cs42xx8-spi.c b/sound/soc/codecs/cs42xx8-spi.c
index b86fe2fe771e..2e4b8e6c4081 100644
--- a/sound/soc/codecs/cs42xx8-spi.c
+++ b/sound/soc/codecs/cs42xx8-spi.c
@@ -6,7 +6,6 @@
  *
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index ced1270c4d68..6ac6d306b054 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -7,7 +7,6 @@
  * Authors: Tim Howe <Tim.Howe@cirrus.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 6a428387e496..3abe77423f29 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -12,7 +12,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
 #include <sound/pcm.h>
diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c
index d067f7bda03a..b926340256be 100644
--- a/sound/soc/codecs/es8323.c
+++ b/sound/soc/codecs/es8323.c
@@ -18,7 +18,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/sound/soc/codecs/es9356.c b/sound/soc/codecs/es9356.c
index 670e918b56a4..d645490e7bb8 100644
--- a/sound/soc/codecs/es9356.c
+++ b/sound/soc/codecs/es9356.c
@@ -7,7 +7,6 @@
 //
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c
index cc811f58c9d2..b0f8043fb9e2 100644
--- a/sound/soc/codecs/max98357a.c
+++ b/sound/soc/codecs/max98357a.c
@@ -10,7 +10,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/codecs/max98373-i2c.c b/sound/soc/codecs/max98373-i2c.c
index 20de379d08de..8805bd01153c 100644
--- a/sound/soc/codecs/max98373-i2c.c
+++ b/sound/soc/codecs/max98373-i2c.c
@@ -5,7 +5,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/pm.h>
 #include <linux/regmap.h>
diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c
index 6829fa07c9ec..d048fa9ad450 100644
--- a/sound/soc/codecs/max98373-sdw.c
+++ b/sound/soc/codecs/max98373-sdw.c
@@ -4,7 +4,6 @@
 #include <linux/acpi.h>
 #include <linux/delay.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
diff --git a/sound/soc/codecs/max98388.c b/sound/soc/codecs/max98388.c
index 2576841b7de2..a4c57152d25f 100644
--- a/sound/soc/codecs/max98388.c
+++ b/sound/soc/codecs/max98388.c
@@ -6,7 +6,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/sound/soc/codecs/mt6351.c b/sound/soc/codecs/mt6351.c
index 2a5e963fb2b5..1768c249650d 100644
--- a/sound/soc/codecs/mt6351.c
+++ b/sound/soc/codecs/mt6351.c
@@ -8,7 +8,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 
diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c
index a787accb88e8..ed8cbc63fa77 100644
--- a/sound/soc/codecs/mt6358.c
+++ b/sound/soc/codecs/mt6358.c
@@ -6,7 +6,6 @@
 // Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
 
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
diff --git a/sound/soc/codecs/pcm3168a-i2c.c b/sound/soc/codecs/pcm3168a-i2c.c
index 334f344761aa..dd24027836b2 100644
--- a/sound/soc/codecs/pcm3168a-i2c.c
+++ b/sound/soc/codecs/pcm3168a-i2c.c
@@ -10,7 +10,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 
 #include <sound/soc.h>
 
diff --git a/sound/soc/codecs/rt1017-sdca-sdw.c b/sound/soc/codecs/rt1017-sdca-sdw.c
index d62e8a253676..5dc72d5ece56 100644
--- a/sound/soc/codecs/rt1017-sdca-sdw.c
+++ b/sound/soc/codecs/rt1017-sdca-sdw.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <sound/core.h>
diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
index 39e06a3a7560..13251f4bd84a 100644
--- a/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
 #include <linux/soundwire/sdw_registers.h>
diff --git a/sound/soc/codecs/rt1316-sdw.c b/sound/soc/codecs/rt1316-sdw.c
index 1828fd9d5af6..1efaf1e426bb 100644
--- a/sound/soc/codecs/rt1316-sdw.c
+++ b/sound/soc/codecs/rt1316-sdw.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <sound/core.h>
diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c
index 51bd11b92a55..c038ac0e3b76 100644
--- a/sound/soc/codecs/rt1318-sdw.c
+++ b/sound/soc/codecs/rt1318-sdw.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/dmi.h>
diff --git a/sound/soc/codecs/rt1320-sdw.c b/sound/soc/codecs/rt1320-sdw.c
index 13493b85f3c9..1e930b27c67a 100644
--- a/sound/soc/codecs/rt1320-sdw.c
+++ b/sound/soc/codecs/rt1320-sdw.c
@@ -8,7 +8,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/dmi.h>
diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index 30fcca210f05..8489953c2953 100644
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -8,7 +8,6 @@
 
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
 #include <linux/soundwire/sdw_registers.h>
diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c
index a8164fc3979a..37e370eadc28 100644
--- a/sound/soc/codecs/rt711-sdca-sdw.c
+++ b/sound/soc/codecs/rt711-sdca-sdw.c
@@ -8,7 +8,6 @@
 
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
index df3c43f2ab6b..a0c6a9efa840 100644
--- a/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@ -8,7 +8,6 @@
 
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
 #include <linux/soundwire/sdw_registers.h>
diff --git a/sound/soc/codecs/rt712-sdca-dmic.c b/sound/soc/codecs/rt712-sdca-dmic.c
index 4c5c2f5ba5ed..26b3705f0436 100644
--- a/sound/soc/codecs/rt712-sdca-dmic.c
+++ b/sound/soc/codecs/rt712-sdca-dmic.c
@@ -7,7 +7,6 @@
 //
 
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/slab.h>
diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c
index 581732180473..bd8a026dee0b 100644
--- a/sound/soc/codecs/rt712-sdca-sdw.c
+++ b/sound/soc/codecs/rt712-sdca-sdw.c
@@ -8,7 +8,6 @@
 
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw_registers.h>
diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c
index 4b9815b5628d..2f8dc2e07896 100644
--- a/sound/soc/codecs/rt715-sdca-sdw.c
+++ b/sound/soc/codecs/rt715-sdca-sdw.c
@@ -8,7 +8,6 @@
 
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
 #include <linux/soundwire/sdw_registers.h>
diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
index 7f83a8f1a06e..37feb6719713 100644
--- a/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@ -9,7 +9,6 @@
  */
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
 #include <linux/soundwire/sdw_registers.h>
diff --git a/sound/soc/codecs/rt721-sdca-sdw.c b/sound/soc/codecs/rt721-sdca-sdw.c
index 58606209316a..0e3758be10ea 100644
--- a/sound/soc/codecs/rt721-sdca-sdw.c
+++ b/sound/soc/codecs/rt721-sdca-sdw.c
@@ -9,7 +9,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw_registers.h>
 
diff --git a/sound/soc/codecs/rt722-sdca-sdw.c b/sound/soc/codecs/rt722-sdca-sdw.c
index 0f76492ff915..1a7231212ad9 100644
--- a/sound/soc/codecs/rt722-sdca-sdw.c
+++ b/sound/soc/codecs/rt722-sdca-sdw.c
@@ -9,7 +9,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
 #include <linux/soundwire/sdw_registers.h>
 
diff --git a/sound/soc/codecs/rt9123.c b/sound/soc/codecs/rt9123.c
index 84fd3d6861de..07eaf275c9e9 100644
--- a/sound/soc/codecs/rt9123.c
+++ b/sound/soc/codecs/rt9123.c
@@ -13,7 +13,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/codecs/rt9123p.c b/sound/soc/codecs/rt9123p.c
index d509659e735b..584fcb78cd3f 100644
--- a/sound/soc/codecs/rt9123p.c
+++ b/sound/soc/codecs/rt9123p.c
@@ -9,7 +9,6 @@
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/codecs/rtq9124.c b/sound/soc/codecs/rtq9124.c
index 186904b31434..2a041894bc0c 100644
--- a/sound/soc/codecs/rtq9124.c
+++ b/sound/soc/codecs/rtq9124.c
@@ -12,7 +12,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/codecs/rtq9128.c b/sound/soc/codecs/rtq9128.c
index 14a2c0723d33..573200e5062f 100644
--- a/sound/soc/codecs/rtq9128.c
+++ b/sound/soc/codecs/rtq9128.c
@@ -11,7 +11,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
diff --git a/sound/soc/codecs/sdw-mockup.c b/sound/soc/codecs/sdw-mockup.c
index b7e6546f1b5a..93f3fd1882a5 100644
--- a/sound/soc/codecs/sdw-mockup.c
+++ b/sound/soc/codecs/sdw-mockup.c
@@ -8,7 +8,6 @@
 //
 
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
diff --git a/sound/soc/codecs/simple-amplifier.c b/sound/soc/codecs/simple-amplifier.c
index ca0e6ce8cc37..ca53b08c0b33 100644
--- a/sound/soc/codecs/simple-amplifier.c
+++ b/sound/soc/codecs/simple-amplifier.c
@@ -14,7 +14,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/math.h>
 #include <linux/minmax.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index c7aaf98ef71e..7fce60de5e5f 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -7,7 +7,6 @@
 // Auther: Gyuhwa Park <gyuhwa.park@irondevice.com>
 //         Kiseok Jo <kiseok.jo@irondevice.com>
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/sound/soc/codecs/src4xxx-i2c.c b/sound/soc/codecs/src4xxx-i2c.c
index 34b3abdb9a70..4157f7787801 100644
--- a/sound/soc/codecs/src4xxx-i2c.c
+++ b/sound/soc/codecs/src4xxx-i2c.c
@@ -6,7 +6,6 @@
 // Author: Matt Flax <flatmax@flatmax.com>
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 
diff --git a/sound/soc/codecs/uda1334.c b/sound/soc/codecs/uda1334.c
index f799772ff747..54c5cb5b3d4b 100644
--- a/sound/soc/codecs/uda1334.c
+++ b/sound/soc/codecs/uda1334.c
@@ -4,7 +4,6 @@
 //
 // Based on WM8523 ALSA SoC Audio driver written by Mark Brown
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 589a89564813..137dcd3d7487 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -7,7 +7,6 @@
  * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 65108a041c92..b8832a1d61fe 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -7,7 +7,6 @@
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8524.c b/sound/soc/codecs/wm8524.c
index 6b1a7450b0ac..23daf158f35f 100644
--- a/sound/soc/codecs/wm8524.c
+++ b/sound/soc/codecs/wm8524.c
@@ -8,7 +8,6 @@
  * Based on WM8523 ALSA SoC Audio driver written by Mark Brown
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index ca7bbe5d4fc3..eb374ba6e5b5 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -15,7 +15,6 @@
  *  the secondary audio interfaces are not.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 5271966b1615..2db8829661c3 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -9,7 +9,6 @@
  * Based on wm8731.c by Richard Purdie
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 6e6fd77c3020..3109a6a0df74 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -7,7 +7,6 @@
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8731-i2c.c b/sound/soc/codecs/wm8731-i2c.c
index 5d19fcc46606..f44f4d3d9394 100644
--- a/sound/soc/codecs/wm8731-i2c.c
+++ b/sound/soc/codecs/wm8731-i2c.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "wm8731.h"
diff --git a/sound/soc/codecs/wm8731-spi.c b/sound/soc/codecs/wm8731-spi.c
index c02086afa7fb..29e58e1e6b79 100644
--- a/sound/soc/codecs/wm8731-spi.c
+++ b/sound/soc/codecs/wm8731-spi.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/spi/spi.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 
 #include "wm8731.h"
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index 4eb42d19bc7e..33a3f88fffb3 100644
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -7,7 +7,6 @@
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 95b23504f68d..ac4008b4832d 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -26,7 +26,6 @@
  * an alsa kcontrol. This allows the PCM to remain open.
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index d382b476c89c..b8b4d1e823e6 100644
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -7,7 +7,6 @@
  * Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index f3b02c77314f..a8e4f71c77d1 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -9,7 +9,6 @@
  * TODO: Input ALC/limiter support
  */
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/sound/soc/fsl/fsl_aud2htx.c b/sound/soc/fsl/fsl_aud2htx.c
index da401561e2de..8f2aa8f7d4e8 100644
--- a/sound/soc/fsl/fsl_aud2htx.c
+++ b/sound/soc/fsl/fsl_aud2htx.c
@@ -5,7 +5,6 @@
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/dmaengine.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 8554fb690772..c21104355aa0 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -5,7 +5,6 @@
 // Copyright (C) 2009 Jon Smirl, Digispeaker
 // Author: Jon Smirl <jonsmirl@gmail.com>
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/time.h>
diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.c b/sound/soc/generic/audio-graph-card2-custom-sample.c
index 7151d426bee9..14b212675240 100644
--- a/sound/soc/generic/audio-graph-card2-custom-sample.c
+++ b/sound/soc/generic/audio-graph-card2-custom-sample.c
@@ -6,7 +6,6 @@
 // Copyright (C) 2020 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 //
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <sound/graph_card.h>
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 517619531615..d36bbc820618 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -11,7 +11,6 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
diff --git a/sound/soc/mediatek/mt8365/mt8365-mt6357.c b/sound/soc/mediatek/mt8365/mt8365-mt6357.c
index 10f9ef73c130..90448df6c0b2 100644
--- a/sound/soc/mediatek/mt8365/mt8365-mt6357.c
+++ b/sound/soc/mediatek/mt8365/mt8365-mt6357.c
@@ -9,7 +9,6 @@
 #include <linux/array_size.h>
 #include <linux/dev_printk.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c
index 4f6594cc723c..cfd6438dbcb3 100644
--- a/sound/soc/qcom/apq8096.c
+++ b/sound/soc/qcom/apq8096.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2018, Linaro Limited
 
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <sound/soc.h>
diff --git a/sound/soc/qcom/sc7280.c b/sound/soc/qcom/sc7280.c
index abdd58c1d0a4..d3d8a6e83268 100644
--- a/sound/soc/qcom/sc7280.c
+++ b/sound/soc/qcom/sc7280.c
@@ -7,7 +7,6 @@
 #include <dt-bindings/sound/qcom,lpass.h>
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <linux/input.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <sound/core.h>
diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c
index c8d5ac43a176..1e0eda8c24c4 100644
--- a/sound/soc/qcom/storm.c
+++ b/sound/soc/qcom/storm.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
index 6937a91ddfb9..8d7b007a068f 100644
--- a/sound/soc/sdca/sdca_class.c
+++ b/sound/soc/sdca/sdca_class.c
@@ -9,7 +9,6 @@
 
 #include <linux/device.h>
 #include <linux/err.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/sof/sof-client-ipc-flood-test.c b/sound/soc/sof/sof-client-ipc-flood-test.c
index 7b72d1c9c739..2396cc35489a 100644
--- a/sound/soc/sof/sof-client-ipc-flood-test.c
+++ b/sound/soc/sof/sof-client-ipc-flood-test.c
@@ -10,7 +10,6 @@
 #include <linux/completion.h>
 #include <linux/debugfs.h>
 #include <linux/ktime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
diff --git a/sound/soc/sof/sof-client-ipc-kernel-injector.c b/sound/soc/sof/sof-client-ipc-kernel-injector.c
index d5984990098a..02d0d97ad1a0 100644
--- a/sound/soc/sof/sof-client-ipc-kernel-injector.c
+++ b/sound/soc/sof/sof-client-ipc-kernel-injector.c
@@ -7,7 +7,6 @@
 
 #include <linux/auxiliary_bus.h>
 #include <linux/debugfs.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <sound/sof/header.h>
diff --git a/sound/soc/sof/sof-client-ipc-msg-injector.c b/sound/soc/sof/sof-client-ipc-msg-injector.c
index c28f106de6ba..932ab459c079 100644
--- a/sound/soc/sof/sof-client-ipc-msg-injector.c
+++ b/sound/soc/sof/sof-client-ipc-msg-injector.c
@@ -9,7 +9,6 @@
 #include <linux/completion.h>
 #include <linux/debugfs.h>
 #include <linux/ktime.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
index a19f8aaaf1c4..9f5b067a8ccc 100644
--- a/sound/soc/sunxi/sun50i-codec-analog.c
+++ b/sound/soc/sunxi/sun50i-codec-analog.c
@@ -13,7 +13,6 @@
 
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c
index eddfebe16616..5c784b1f6846 100644
--- a/sound/soc/sunxi/sun50i-dmic.c
+++ b/sound/soc/sunxi/sun50i-dmic.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
index 7135aa23a7fc..7f360dfaf8b1 100644
--- a/sound/soc/tegra/tegra186_asrc.c
+++ b/sound/soc/tegra/tegra186_asrc.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
index 7cf7d6dbfc35..0d3807b231f3 100644
--- a/sound/soc/tegra/tegra186_dspk.c
+++ b/sound/soc/tegra/tegra186_dspk.c
@@ -5,7 +5,6 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 38661d9b4a7c..5eefcf149ae3 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -10,7 +10,6 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
index 9b662fcee66f..15a94196ee1a 100644
--- a/sound/soc/tegra/tegra210_adx.c
+++ b/sound/soc/tegra/tegra210_adx.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
index 930b080aec0a..cc1f9c158191 100644
--- a/sound/soc/tegra/tegra210_amx.c
+++ b/sound/soc/tegra/tegra210_amx.c
@@ -8,7 +8,6 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
index 3e42e2c75eb9..6098ad056ba9 100644
--- a/sound/soc/tegra/tegra210_dmic.c
+++ b/sound/soc/tegra/tegra210_dmic.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
index 0259b137547c..ff8c72fc38c5 100644
--- a/sound/soc/tegra/tegra210_i2s.c
+++ b/sound/soc/tegra/tegra210_i2s.c
@@ -6,7 +6,6 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
index c237ba7531de..a69774578d69 100644
--- a/sound/soc/tegra/tegra210_mixer.c
+++ b/sound/soc/tegra/tegra210_mixer.c
@@ -8,7 +8,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/math64.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
index b55f8142c4a4..ac04350107c4 100644
--- a/sound/soc/tegra/tegra210_mvc.c
+++ b/sound/soc/tegra/tegra210_mvc.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/tegra/tegra210_ope.c b/sound/soc/tegra/tegra210_ope.c
index ad4c400281e8..30a54b1222d9 100644
--- a/sound/soc/tegra/tegra210_ope.c
+++ b/sound/soc/tegra/tegra210_ope.c
@@ -7,7 +7,6 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c
index 7ca46c57566d..b795b9f66b0e 100644
--- a/sound/soc/ti/omap-dmic.c
+++ b/sound/soc/ti/omap-dmic.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
index c7d7b502f120..5698d2f26973 100644
--- a/sound/soc/ti/omap-mcpdm.c
+++ b/sound/soc/ti/omap-mcpdm.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
index a1d170f88fee..a7da279aa3ef 100644
--- a/tools/testing/cxl/test/mem.c
+++ b/tools/testing/cxl/test/mem.c
@@ -2,7 +2,6 @@
 // Copyright(c) 2021 Intel Corporation. All rights reserved.
 
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* Re: [PATCH v2 12/17] usb: dwc2: Add include defining struct pci_device_id
  2026-06-26 18:00 ` [PATCH v2 12/17] usb: dwc2: Add include defining struct pci_device_id Uwe Kleine-König (The Capable Hub)
@ 2026-06-26 18:23   ` Greg Kroah-Hartman
  0 siblings, 0 replies; 26+ messages in thread
From: Greg Kroah-Hartman @ 2026-06-26 18:23 UTC (permalink / raw)
  To: Uwe Kleine-König (The Capable Hub)
  Cc: Linus Torvalds, Minas Harutyunyan, linux-usb, linux-kernel

On Fri, Jun 26, 2026 at 08:00:31PM +0200, Uwe Kleine-König (The Capable Hub) wrote:
> Up to now <linux/acpi.h> includes <linux/mod_devicetable.h> that
> provides struct pci_device_id. However <linux/mod_devicetable.h> was
> split into per bus headers and <linux/acpi.h> will only include the acpi
> related one (and similar for other bus headers).
> 
> As struct pci_device_id is used in drivers/usb/dwc2/core.h, add an
> include to ensure it's defined also after the includes in <linux/acpi.h>
> are tightened.
> 
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver
  2026-06-26 18:00 ` [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver Uwe Kleine-König (The Capable Hub)
@ 2026-06-26 18:30   ` Linus Torvalds
  2026-06-27 15:50     ` Uwe Kleine-König (The Capable Hub)
  2026-06-26 18:35   ` Greg Kroah-Hartman
  1 sibling, 1 reply; 26+ messages in thread
From: Linus Torvalds @ 2026-06-26 18:30 UTC (permalink / raw)
  To: Uwe Kleine-König (The Capable Hub)
  Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
	driver-core, linux-kernel

Ok, looking at these patches, I realize that I hate the pathname.

On Fri, 26 Jun 2026 at 11:01, Uwe Kleine-König (The Capable Hub)
<u.kleine-koenig@baylibre.com> wrote:
>
> +#include <linux/mod_device_id/acpi.h>
> +#include <linux/mod_device_id/of.h>

Honestly, that "mod_" part of the path name makes no sense to me.

Yes, it came from the old header name "mod_devicetable.h", and yes, it
comes from the fact that the device ID structures are also used for
module loading rules. So there's a historical reason for the "mod",
but I don't think it's a particularly good reason, and not a reason to
keep it.

None of the structures are called that - they are just called
"xyz_device_id", and while module loading may be *one* of the uses for
it, it certainly isn't the only one - or even the main one. Arguably a
much bigger reason for those device ids tend to be all the bus
matching code (ie acpi_match_device() and friends).

So let's just get rid of the "mod" part from the name, ok?

              Linus

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver
  2026-06-26 18:00 ` [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver Uwe Kleine-König (The Capable Hub)
  2026-06-26 18:30   ` Linus Torvalds
@ 2026-06-26 18:35   ` Greg Kroah-Hartman
  1 sibling, 0 replies; 26+ messages in thread
From: Greg Kroah-Hartman @ 2026-06-26 18:35 UTC (permalink / raw)
  To: Uwe Kleine-König (The Capable Hub)
  Cc: Linus Torvalds, Rafael J. Wysocki, Danilo Krummrich, driver-core,
	linux-kernel

On Fri, Jun 26, 2026 at 08:00:23PM +0200, Uwe Kleine-König (The Capable Hub) wrote:
> struct device_driver contains pointers of type struct of_device_id* and
> struct acpi_device_id* but doesn't ensure these are defined. To make the
> header self-contained add the (very lightweight) includes that contain
> the respective definitions.
> 
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
> ---
>  include/linux/device/driver.h | 2 ++
>  1 file changed, 2 insertions(+)

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver
  2026-06-26 18:30   ` Linus Torvalds
@ 2026-06-27 15:50     ` Uwe Kleine-König (The Capable Hub)
  0 siblings, 0 replies; 26+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-27 15:50 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Danilo Krummrich,
	driver-core, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hello Linus,

On Fri, Jun 26, 2026 at 11:30:34AM -0700, Linus Torvalds wrote:
> Ok, looking at these patches, I realize that I hate the pathname.
> 
> On Fri, 26 Jun 2026 at 11:01, Uwe Kleine-König (The Capable Hub)
> <u.kleine-koenig@baylibre.com> wrote:
> >
> > +#include <linux/mod_device_id/acpi.h>
> > +#include <linux/mod_device_id/of.h>
> 
> Honestly, that "mod_" part of the path name makes no sense to me.
> 
> Yes, it came from the old header name "mod_devicetable.h", and yes, it
> comes from the fact that the device ID structures are also used for
> module loading rules. So there's a historical reason for the "mod",
> but I don't think it's a particularly good reason, and not a reason to
> keep it.
> 
> None of the structures are called that - they are just called
> "xyz_device_id", and while module loading may be *one* of the uses for
> it, it certainly isn't the only one - or even the main one. Arguably a
> much bigger reason for those device ids tend to be all the bus
> matching code (ie acpi_match_device() and friends).
> 
> So let's just get rid of the "mod" part from the name, ok?

Full ack. I already dropped it in my local tree. I won't resent for that
change now and assume Greg's acks still apply. It will be part of v3
that I intend to send after you cut -rc1.

Thanks
Uwe

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH v2 00/17] mod_devicetable.h: Split into per subsystem headers
  2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
@ 2026-06-27 16:07   ` Danilo Krummrich
  -1 siblings, 0 replies; 26+ messages in thread
From: Danilo Krummrich @ 2026-06-27 16:07 UTC (permalink / raw)
  To: Uwe Kleine-König (The Capable Hub)
  Cc: Linus Torvalds, Greg Kroah-Hartman, Mark Brown, Nathan Chancellor,
	Nick Desaulniers, Bill Wendling, Justin Stitt, Raag Jadav,
	Sohil Mehta, Dave Hansen, Rob Herring, Saravana Kannan,
	Bjorn Helgaas, Rafael J. Wysocki, Len Brown, Andi Shyti,
	linux-kernel, Yemike Abhilash Chandra, Mauro Carvalho Chehab,
	linux-media, Nicolas Frattaroli, Liam Girdwood, Jaroslav Kysela,
	Takashi Iwai, Heiko Stuebner, linux-rockchip, linux-sound,
	linux-arm-kernel, driver-core, Jonathan Cameron, Dmitry Torokhov,
	Bartosz Golaszewski, Pei Xiao, Shashank Balaji, Ben Horgan,
	Johan Hovold, linux-usb, Nikita Kravets, Hans de Goede,
	Ilpo Järvinen, platform-driver-x86, devicetree, linux-i2c,
	Daniel Scally, Sakari Ailus, Minas Harutyunyan, Tianrui Zhao,
	Bibo Mao, Huacai Chen, WANG Xuerui, kvm, loongarch

On Fri Jun 26, 2026 at 8:00 PM CEST, Uwe Kleine-König (The Capable Hub) wrote:
> Uwe Kleine-König (The Capable Hub) (17):
>   mod_devicetable.h: Split into per subsystem headers
>   driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver
>   driver core: platform: Include header for struct platform_device_id

With the suggested rename,

Acked-by: Danilo Krummrich <dakr@kernel.org>

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH v2 00/17] mod_devicetable.h: Split into per subsystem headers
@ 2026-06-27 16:07   ` Danilo Krummrich
  0 siblings, 0 replies; 26+ messages in thread
From: Danilo Krummrich @ 2026-06-27 16:07 UTC (permalink / raw)
  To: Uwe Kleine-König (The Capable Hub)
  Cc: Linus Torvalds, Greg Kroah-Hartman, Mark Brown, Nathan Chancellor,
	Nick Desaulniers, Bill Wendling, Justin Stitt, Raag Jadav,
	Sohil Mehta, Dave Hansen, Rob Herring, Saravana Kannan,
	Bjorn Helgaas, Rafael J. Wysocki, Len Brown, Andi Shyti,
	linux-kernel, Yemike Abhilash Chandra, Mauro Carvalho Chehab,
	linux-media, Nicolas Frattaroli, Liam Girdwood, Jaroslav Kysela,
	Takashi Iwai, Heiko Stuebner, linux-rockchip, linux-sound,
	linux-arm-kernel, driver-core, Jonathan Cameron, Dmitry Torokhov,
	Bartosz Golaszewski, Pei Xiao, Shashank Balaji, Ben Horgan,
	Johan Hovold, linux-usb, Nikita Kravets, Hans de Goede,
	Ilpo Järvinen, platform-driver-x86, devicetree, linux-i2c,
	Daniel Scally, Sakari Ailus, Minas Harutyunyan, Tianrui Zhao,
	Bibo Mao, Huacai Chen, WANG Xuerui, kvm, loongarch

On Fri Jun 26, 2026 at 8:00 PM CEST, Uwe Kleine-König (The Capable Hub) wrote:
> Uwe Kleine-König (The Capable Hub) (17):
>   mod_devicetable.h: Split into per subsystem headers
>   driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver
>   driver core: platform: Include header for struct platform_device_id

With the suggested rename,

Acked-by: Danilo Krummrich <dakr@kernel.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2026-06-27 16:07 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-26 18:00 [PATCH v2 00/17] mod_devicetable.h: Split into per subsystem headers Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 01/17] " Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 02/17] media: ti: vpe: #include <linux/platform_device.h> explicitly Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 03/17] ASoC: rockchip: rockchip_sai: " Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00   ` Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 04/17] driver: core: Include headers for acpi_device_id and of_device_id for struct device_driver Uwe Kleine-König (The Capable Hub)
2026-06-26 18:30   ` Linus Torvalds
2026-06-27 15:50     ` Uwe Kleine-König (The Capable Hub)
2026-06-26 18:35   ` Greg Kroah-Hartman
2026-06-26 18:00 ` [PATCH v2 05/17] driver core: platform: Include header for struct platform_device_id Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 06/17] usb: serial: Include <linux/usb.h> in <linux/usb/serial.h> Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 07/17] platform/x86: msi-ec: Ensure dmi_system_id is defined Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 08/17] of: Explicitly include <linux/types.h> and <linux/err.h> Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 09/17] i2c: Let i2c-core.h include <linux/i2c.h> Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 10/17] platform/x86: x86-android-tablets: Add include defining struct dmi_system_id Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 11/17] platform/x86: int3472: " Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 12/17] usb: dwc2: Add include defining struct pci_device_id Uwe Kleine-König (The Capable Hub)
2026-06-26 18:23   ` Greg Kroah-Hartman
2026-06-26 18:00 ` [PATCH v2 13/17] ALSA: hda/core: Add include defining struct hda_device_id Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 14/17] LoongArch: KVM: Add include defining struct cpu_feature Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 15/17] media: em28xx: Add include for struct usb_device_id Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 16/17] Replace <linux/mod_devicetable.h> by more specific <linux/mod_device_id/*.h> (headers) Uwe Kleine-König (The Capable Hub)
2026-06-26 18:00 ` [PATCH v2 17/17] Replace <linux/mod_devicetable.h> by more specific <linux/mod_device_id/*.h> (c files) Uwe Kleine-König (The Capable Hub)
2026-06-27 16:07 ` [PATCH v2 00/17] mod_devicetable.h: Split into per subsystem headers Danilo Krummrich
2026-06-27 16:07   ` Danilo Krummrich

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.