Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (headers)

<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.

Uwe Kleine-König (The Capable Hub) committed 4 months ago

Commit ecca1d61 parent a7e8cae55 files · +57 −59Browse files

Showing the changes to include/linux (47 of 55 files). Show all

Unified · Split

47 files

include/linux/acpi.h +1 −1
include/linux/amba/bus.h +1 −1
include/linux/auxiliary_bus.h +1 −1
include/linux/bcma/bcma.h +1 −1
include/linux/cdx/cdx_bus.h +1 −1
include/linux/dfl.h +1 −1
include/linux/dmi.h +1 −1
include/linux/eisa.h +1 −1
include/linux/firewire.h +1 −2
include/linux/fsl/mc.h +1 −1
include/linux/hid.h +1 −1
include/linux/hyperv.h +1 −1
include/linux/i2c.h +1 −1
include/linux/i3c/device.h +1 −1
include/linux/input.h +1 −1
include/linux/intel-ish-client-if.h +1 −1
include/linux/ipack.h +1 −1
include/linux/isapnp.h +1 −1
include/linux/mcb.h +1 −1
include/linux/mei_cl_bus.h +1 −1
include/linux/mhi.h +1 −0
include/linux/mmc/sdio_func.h +1 −1
include/linux/of.h +1 −1
include/linux/of_platform.h +1 −1
include/linux/pci-epf.h +1 −1
include/linux/pci.h +1 −1
include/linux/phy.h +1 −1
include/linux/platform_data/x86/soc.h +1 −1
include/linux/pnp.h +1 −1
include/linux/raspberrypi/vchiq_bus.h +1 −1
include/linux/rio.h +1 −1
include/linux/rpmsg.h +1 −1
include/linux/serio.h +1 −1
include/linux/slimbus.h +1 −1
include/linux/soc/qcom/apr.h +1 −1
include/linux/soundwire/sdw.h +1 −1
include/linux/spi/spi.h +3 −1
include/linux/ssb/ssb.h +1 −1
include/linux/surface_aggregator/device.h +1 −1
include/linux/tee_drv.h +1 −1
include/linux/thunderbolt.h +1 −1
include/linux/ulpi/driver.h +1 −1
include/linux/usb.h +1 −1
include/linux/usb/typec_altmode.h +1 −1
include/linux/virtio.h +1 −1
include/linux/wmi.h +1 −1
include/linux/zorro.h +1 −1

include/linux/acpi.h+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13	#include <linux/ioport.h> /* for struct resource */
14	14	#include <linux/resource_ext.h>
15	15	#include <linux/device.h>
16		−#include <linux/mod_devicetable.h>
	16	+#include <linux/device-id/acpi.h>
17	17	#include <linux/property.h>
18	18	#include <linux/uuid.h>
19	19	#include <linux/node.h>

include/linux/amba/bus.h+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13
14	14	#include <linux/clk.h>
15	15	#include <linux/device.h>
16		−#include <linux/mod_devicetable.h>
	16	+#include <linux/device-id/amba.h>
17	17	#include <linux/err.h>
18	18	#include <linux/resource.h>
19	19	#include <linux/regulator/consumer.h>

include/linux/auxiliary_bus.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	#define _AUXILIARY_BUS_H_
10	10
11	11	#include <linux/device.h>
12		−#include <linux/mod_devicetable.h>
	12	+#include <linux/device-id/auxiliary.h>
13	13
14	14	/**
15	15	* DOC: DEVICE_LIFESPAN

include/linux/bcma/bcma.h+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3	#define LINUX_BCMA_H_
4	4
5	5	#include <linux/pci.h>
6		−#include <linux/mod_devicetable.h>
	6	+#include <linux/device-id/bcma.h>
7	7
8	8	#include <linux/bcma/bcma_driver_arm_c9.h>
9	9	#include <linux/bcma/bcma_driver_chipcommon.h>

include/linux/cdx/cdx_bus.h+1−1

@@ -11,7 +11,7 @@ · 10 unmodified lines
11	11
12	12	#include <linux/device.h>
13	13	#include <linux/list.h>
14		−#include <linux/mod_devicetable.h>
	14	+#include <linux/device-id/cdx.h>
15	15	#include <linux/msi.h>
16	16
17	17	#define MAX_CDX_DEV_RESOURCES 4

include/linux/dfl.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	#define __LINUX_DFL_H
10	10
11	11	#include <linux/device.h>
12		−#include <linux/mod_devicetable.h>
	12	+#include <linux/device-id/dfl.h>
13	13
14	14	/**
15	15	* enum dfl_id_type - define the DFL FIU types

include/linux/dmi.h+1−1

@@ -4,7 +4,7 @@ · 3 unmodified lines
4	4
5	5	#include <linux/list.h>
6	6	#include <linux/kobject.h>
7		−#include <linux/mod_devicetable.h>
	7	+#include <linux/device-id/dmi.h>
8	8
9	9	/* enum dmi_field is in mod_devicetable.h */
10	10

include/linux/eisa.h+1−1

@@ -4,7 +4,7 @@ · 3 unmodified lines
4	4
5	5	#include <linux/ioport.h>
6	6	#include <linux/device.h>
7		−#include <linux/mod_devicetable.h>
	7	+#include <linux/device-id/eisa.h>
8	8
9	9	#define EISA_MAX_SLOTS 8
10	10

include/linux/firewire.h+1−2

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	14	#include <linux/timer.h>
15	15	#include <linux/types.h>
16	16	#include <linux/workqueue.h>
	17	+#include <linux/device-id/ieee1394.h>
17	18
18	19	#include <linux/atomic.h>
19	20	#include <asm/byteorder.h>
@@ -271,8 +272,6 @@ static inline void fw_unit_put(struct fw_unit *unit) · 251 unmodified lines
271	272
272	273	#define fw_parent_device(unit) fw_device(unit->device.parent)
273	274
274		−struct ieee1394_device_id;
275		−
276	275	struct fw_driver {
277	276	struct device_driver driver;
278	277	int (probe)(struct fw_unit unit, const struct ieee1394_device_id *id);

include/linux/fsl/mc.h+1−1

@@ -11,7 +11,7 @@ · 10 unmodified lines
11	11	#define _FSL_MC_H_
12	12
13	13	#include <linux/device.h>
14		−#include <linux/mod_devicetable.h>
	14	+#include <linux/device-id/fsl_mc.h>
15	15	#include <linux/interrupt.h>
16	16	#include <uapi/linux/fsl_mc.h>
17	17

include/linux/hid.h+1−1

@@ -18,7 +18,7 @@ · 17 unmodified lines
18	18	#include <linux/types.h>
19	19	#include <linux/slab.h>
20	20	#include <linux/list.h>
21		−#include <linux/mod_devicetable.h> /* hid_device_id */
	21	+#include <linux/device-id/hid.h>
22	22	#include <linux/timer.h>
23	23	#include <linux/workqueue.h>
24	24	#include <linux/input.h>

include/linux/hyperv.h+1−1

@@ -21,7 +21,7 @@ · 20 unmodified lines
21	21	#include <linux/timer.h>
22	22	#include <linux/completion.h>
23	23	#include <linux/device.h>
24		−#include <linux/mod_devicetable.h>
	24	+#include <linux/device-id/hv_vmbus.h>
25	25	#include <linux/interrupt.h>
26	26	#include <linux/reciprocal_div.h>
27	27	#include <hyperv/hvhdk.h>

include/linux/i2c.h+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12
13	13	#include <linux/acpi.h> /* for acpi_handle */
14	14	#include <linux/bits.h>
15		−#include <linux/mod_devicetable.h>
	15	+#include <linux/device-id/i2c.h>
16	16	#include <linux/device.h> /* for struct device */
17	17	#include <linux/sched.h> /* for completion */
18	18	#include <linux/mutex.h>

include/linux/i3c/device.h+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12	#include <linux/device.h>
13	13	#include <linux/i2c.h>
14	14	#include <linux/kconfig.h>
15		−#include <linux/mod_devicetable.h>
	15	+#include <linux/device-id/i3c.h>
16	16	#include <linux/module.h>
17	17
18	18	/**

include/linux/input.h+1−1

@@ -19,7 +19,7 @@ · 18 unmodified lines
19	19	#include <linux/device.h>
20	20	#include <linux/fs.h>
21	21	#include <linux/timer.h>
22		−#include <linux/mod_devicetable.h>
	22	+#include <linux/device-id/input.h>
23	23
24	24	struct input_dev_poller;
25	25

include/linux/intel-ish-client-if.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	#define _INTEL_ISH_CLIENT_IF_H_
10	10
11	11	#include <linux/device.h>
12		−#include <linux/mod_devicetable.h>
	12	+#include <linux/device-id/ishtp.h>
13	13
14	14	struct ishtp_cl_device;
15	15	struct ishtp_device;

include/linux/ipack.h+1−1

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	6	* Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
7	7	*/
8	8
9		−#include <linux/mod_devicetable.h>
	9	+#include <linux/device-id/ipack.h>
10	10	#include <linux/device.h>
11	11	#include <linux/interrupt.h>
12	12

include/linux/isapnp.h+1−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	28	*/
29	29
30	30	#ifdef __KERNEL__
31		−#include <linux/mod_devicetable.h>
	31	+#include <linux/device-id/isapnp.h>
32	32
33	33	#define DEVICE_COUNT_COMPATIBLE 4
34	34

include/linux/mcb.h+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	#ifndef _LINUX_MCB_H
9	9	#define _LINUX_MCB_H
10	10
11		−#include <linux/mod_devicetable.h>
	11	+#include <linux/device-id/mcb.h>
12	12	#include <linux/device.h>
13	13	#include <linux/irqreturn.h>
14	14

include/linux/mei_cl_bus.h+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7	7
8	8	#include <linux/device.h>
9	9	#include <linux/uuid.h>
10		−#include <linux/mod_devicetable.h>
	10	+#include <linux/device-id/mei_cl.h>
11	11
12	12	struct mei_cl_device;
13	13	struct mei_device;

include/linux/mhi.h+1−0

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	14	#include <linux/spinlock.h>
15	15	#include <linux/wait.h>
16	16	#include <linux/workqueue.h>
	17	+#include <linux/device-id/mhi.h>
17	18
18	19	#define MHI_MAX_OEM_PK_HASH_SEGMENTS 16
19	20

include/linux/mmc/sdio_func.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	#define LINUX_MMC_SDIO_FUNC_H
10	10
11	11	#include <linux/device.h>
12		−#include <linux/mod_devicetable.h>
	12	+#include <linux/device-id/sdio.h>
13	13
14	14	#include <linux/mmc/pm.h>
15	15

include/linux/of.h+1−1

@@ -16,7 +16,7 @@ · 15 unmodified lines
16	16	#include <linux/cleanup.h>
17	17	#include <linux/errno.h>
18	18	#include <linux/kobject.h>
19		−#include <linux/mod_devicetable.h>
	19	+#include <linux/device-id/of.h>
20	20	#include <linux/property.h>
21	21	#include <linux/list.h>
22	22

include/linux/of_platform.h+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8
9	9	#include <linux/types.h>
10	10	#include <linux/err.h>
11		−#include <linux/mod_devicetable.h>
	11	+#include <linux/device-id/of.h>
12	12
13	13	struct device;
14	14	struct device_node;

include/linux/pci-epf.h+1−1

@@ -11,7 +11,7 @@ · 10 unmodified lines
11	11
12	12	#include <linux/configfs.h>
13	13	#include <linux/device.h>
14		−#include <linux/mod_devicetable.h>
	14	+#include <linux/device-id/pci.h>
15	15	#include <linux/msi.h>
16	16	#include <linux/pci.h>
17	17

include/linux/pci.h+1−1

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24	#define LINUX_PCI_H
25	25
26	26	#include <linux/args.h>
27		−#include <linux/mod_devicetable.h>
	27	+#include <linux/device-id/pci.h>
28	28
29	29	#include <linux/types.h>
30	30	#include <linux/sizes.h>

include/linux/phy.h+1−1

@@ -23,7 +23,7 @@ · 22 unmodified lines
23	23	#include <linux/module.h>
24	24	#include <linux/timer.h>
25	25	#include <linux/workqueue.h>
26		−#include <linux/mod_devicetable.h>
	26	+#include <linux/device-id/mdio.h>
27	27	#include <linux/u64_stats_sync.h>
28	28	#include <linux/irqreturn.h>
29	29	#include <linux/iopoll.h>

include/linux/platform_data/x86/soc.h+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12
13	13	#if IS_ENABLED(CONFIG_X86)
14	14
15		−#include <linux/mod_devicetable.h>
	15	+#include <linux/device-id/x86_cpu.h>
16	16
17	17	#include <asm/cpu_device_id.h>
18	18

include/linux/pnp.h+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12	#include <linux/device.h>
13	13	#include <linux/list.h>
14	14	#include <linux/errno.h>
15		−#include <linux/mod_devicetable.h>
	15	+#include <linux/device-id/pnp.h>
16	16	#include <linux/console.h>
17	17
18	18	#define PNP_NAME_LEN 50

include/linux/raspberrypi/vchiq_bus.h+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7	7	#define _VCHIQ_DEVICE_H
8	8
9	9	#include <linux/device.h>
10		−#include <linux/mod_devicetable.h>
	10	+#include <linux/device-id/vchiq.h>
11	11
12	12	struct vchiq_drv_mgmt;
13	13

include/linux/rio.h+1−1

@@ -16,7 +16,7 @@ · 15 unmodified lines
16	16	#include <linux/errno.h>
17	17	#include <linux/device.h>
18	18	#include <linux/rio_regs.h>
19		−#include <linux/mod_devicetable.h>
	19	+#include <linux/device-id/rio.h>
20	20	#ifdef CONFIG_RAPIDIO_DMA_ENGINE
21	21	#include <linux/dmaengine.h>
22	22	#endif

include/linux/rpmsg.h+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13	#include <linux/types.h>
14	14	#include <linux/device.h>
15	15	#include <linux/err.h>
16		−#include <linux/mod_devicetable.h>
	16	+#include <linux/device-id/rpmsg.h>
17	17	#include <linux/kref.h>
18	18	#include <linux/mutex.h>
19	19	#include <linux/poll.h>

include/linux/serio.h+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13	#include <linux/spinlock.h>
14	14	#include <linux/mutex.h>
15	15	#include <linux/device.h>
16		−#include <linux/mod_devicetable.h>
	16	+#include <linux/device-id/serio.h>
17	17	#include <uapi/linux/serio.h>
18	18
19	19	extern const struct bus_type serio_bus;

include/linux/slimbus.h+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	#include <linux/device.h>
9	9	#include <linux/module.h>
10	10	#include <linux/completion.h>
11		−#include <linux/mod_devicetable.h>
	11	+#include <linux/device-id/slim.h>
12	12
13	13	extern const struct bus_type slimbus_bus;
14	14

include/linux/soc/qcom/apr.h+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	5
6	6	#include <linux/spinlock.h>
7	7	#include <linux/device.h>
8		−#include <linux/mod_devicetable.h>
	8	+#include <linux/device-id/apr.h>
9	9	#include <dt-bindings/soc/qcom,apr.h>
10	10	#include <dt-bindings/soc/qcom,gpr.h>
11	11

include/linux/soundwire/sdw.h+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13	#include <linux/irqdomain.h>
14	14	#include <linux/jiffies.h>
15	15	#include <linux/lockdep_types.h>
16		−#include <linux/mod_devicetable.h>
	16	+#include <linux/device-id/sdw.h>
17	17	#include <linux/mutex.h>
18	18	#include <linux/types.h>
19	19	#include <sound/sdca.h>

include/linux/spi/spi.h+3−1

@@ -12,7 +12,9 @@ · 11 unmodified lines
12	12	#include <linux/device.h>
13	13	#include <linux/gpio/consumer.h>
14	14	#include <linux/kthread.h>
15		−#include <linux/mod_devicetable.h>
	15	+#include <linux/device-id/acpi.h>
	16	+#include <linux/device-id/of.h>
	17	+#include <linux/device-id/spi.h>
16	18	#include <linux/overflow.h>
17	19	#include <linux/scatterlist.h>
18	20	#include <linux/slab.h>

include/linux/ssb/ssb.h+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	#include <linux/spinlock.h>
9	9	#include <linux/pci.h>
10	10	#include <linux/gpio/driver.h>
11		−#include <linux/mod_devicetable.h>
	11	+#include <linux/device-id/ssb.h>
12	12	#include <linux/dma-mapping.h>
13	13	#include <linux/platform_device.h>
14	14

include/linux/surface_aggregator/device.h+1−1

@@ -14,7 +14,7 @@ · 13 unmodified lines
14	14	#define _LINUX_SURFACE_AGGREGATOR_DEVICE_H
15	15
16	16	#include <linux/device.h>
17		−#include <linux/mod_devicetable.h>
	17	+#include <linux/device-id/ssam.h>
18	18	#include <linux/property.h>
19	19	#include <linux/types.h>
20	20

include/linux/tee_drv.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	#include <linux/device.h>
10	10	#include <linux/kref.h>
11	11	#include <linux/list.h>
12		−#include <linux/mod_devicetable.h>
	12	+#include <linux/device-id/tee_client.h>
13	13	#include <linux/tee.h>
14	14	#include <linux/types.h>
15	15

include/linux/thunderbolt.h+1−1

@@ -23,7 +23,7 @@ struct device; · 22 unmodified lines
23	23	#include <linux/idr.h>
24	24	#include <linux/list.h>
25	25	#include <linux/mutex.h>
26		−#include <linux/mod_devicetable.h>
	26	+#include <linux/device-id/tb.h>
27	27	#include <linux/pci.h>
28	28	#include <linux/uuid.h>
29	29	#include <linux/workqueue.h>

include/linux/ulpi/driver.h+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	2	#ifndef __LINUX_ULPI_DRIVER_H
3	3	#define __LINUX_ULPI_DRIVER_H
4	4
5		−#include <linux/mod_devicetable.h>
	5	+#include <linux/device-id/ulpi.h>
6	6
7	7	#include <linux/device.h>
8	8

include/linux/usb.h+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	2	#ifndef __LINUX_USB_H
3	3	#define __LINUX_USB_H
4	4
5		−#include <linux/mod_devicetable.h>
	5	+#include <linux/device-id/usb.h>
6	6	#include <linux/usb/ch9.h>
7	7
8	8	#define USB_MAJOR 180

include/linux/usb/typec_altmode.h+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3	#ifndef __USB_TYPEC_ALTMODE_H
4	4	#define __USB_TYPEC_ALTMODE_H
5	5
6		−#include <linux/mod_devicetable.h>
	6	+#include <linux/device-id/typec.h>
7	7	#include <linux/usb/typec.h>
8	8	#include <linux/device.h>
9	9

include/linux/virtio.h+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7	7	#include <linux/scatterlist.h>
8	8	#include <linux/spinlock.h>
9	9	#include <linux/device.h>
10		−#include <linux/mod_devicetable.h>
	10	+#include <linux/device-id/virtio.h>
11	11	#include <linux/gfp.h>
12	12	#include <linux/dma-mapping.h>
13	13	#include <linux/completion.h>

include/linux/wmi.h+1−1

@@ -11,7 +11,7 @@ · 10 unmodified lines
11	11	#include <linux/compiler_attributes.h>
12	12	#include <linux/device.h>
13	13	#include <linux/acpi.h>
14		−#include <linux/mod_devicetable.h>
	14	+#include <linux/device-id/wmi.h>
15	15	#include <linux/types.h>
16	16
17	17	/**

include/linux/zorro.h+1−1

@@ -17,7 +17,7 @@ · 16 unmodified lines
17	17	#include <linux/device.h>
18	18	#include <linux/init.h>
19	19	#include <linux/ioport.h>
20		−#include <linux/mod_devicetable.h>
	20	+#include <linux/device-id/zorro.h>
21	21
22	22	#include <asm/zorro.h>
23	23

Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (headers)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code