Skip to content
This repository was archived by the owner on Jun 18, 2024. It is now read-only.

Commit

Permalink
of: Stop circularly including of_device.h and of_platform.h
Browse files Browse the repository at this point in the history
The DT of_device.h and of_platform.h headers 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. The headers also include
platform_device.h and of.h. The result was lots of drivers relied on
these implicit includes.

Now the entire tree has been fixed over the last couple of cycles to
explicitly include the necessary headers instead of relying on
of_device.h and/or of_platform.h implicit includes, so the implicit and
circular includes can finally be removed.

Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
robherring committed Jan 19, 2024
1 parent 527eb67 commit ef175b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions include/linux/of_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
#ifndef _LINUX_OF_DEVICE_H
#define _LINUX_OF_DEVICE_H

#include <linux/platform_device.h>
#include <linux/of_platform.h> /* temporary until merge */

#include <linux/of.h>
#include <linux/device/driver.h>

struct device;
struct of_device_id;
Expand Down
4 changes: 2 additions & 2 deletions include/linux/of_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
*/

#include <linux/mod_devicetable.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>

struct device;
struct device_node;
struct of_device_id;
struct platform_device;

/**
* struct of_dev_auxdata - lookup table entry for device names & platform_data
Expand Down

0 comments on commit ef175b2

Please sign in to comment.