Skip to content

Commit ae36453

Browse files
committed
tpm: Explicitly include correct DT includes
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it was merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Acked-by: Jarkko Sakkinen <jarkko@kernel.org> Link: https://lore.kernel.org/r/20230728134803.3223742-1-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 077ca04 commit ae36453

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

drivers/char/tpm/tpm_ftpm_tee.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include <linux/acpi.h>
1313
#include <linux/of.h>
14-
#include <linux/of_platform.h>
1514
#include <linux/platform_device.h>
1615
#include <linux/tee_drv.h>
1716
#include <linux/tpm.h>

drivers/char/tpm/tpm_tis.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <linux/acpi.h>
2626
#include <linux/freezer.h>
2727
#include <linux/of.h>
28-
#include <linux/of_device.h>
2928
#include <linux/kernel.h>
3029
#include <linux/dmi.h>
3130
#include "tpm.h"

drivers/char/tpm/tpm_tis_spi_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <linux/module.h>
2929
#include <linux/slab.h>
3030

31-
#include <linux/of_device.h>
31+
#include <linux/of.h>
3232
#include <linux/spi/spi.h>
3333
#include <linux/tpm.h>
3434

drivers/char/tpm/tpm_tis_synquacer.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/module.h>
1010
#include <linux/slab.h>
1111
#include <linux/of.h>
12-
#include <linux/of_device.h>
1312
#include <linux/kernel.h>
1413
#include "tpm.h"
1514
#include "tpm_tis_core.h"

0 commit comments

Comments
 (0)