Skip to content

Commit 9357b04

Browse files
mripardpH5
authored andcommitted
reset: Move reset-simple header out of drivers/reset
The reset-simple code can be useful for drivers outside of drivers/reset that have a few reset controls as part of their features. Let's move it to include/linux/reset. Reviewed-by: Philipp Zabel <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Signed-off-by: Philipp Zabel <[email protected]>
1 parent b3a9e3b commit 9357b04

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

drivers/reset/reset-simple.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
#include <linux/of_device.h>
1919
#include <linux/platform_device.h>
2020
#include <linux/reset-controller.h>
21+
#include <linux/reset/reset-simple.h>
2122
#include <linux/spinlock.h>
2223

23-
#include "reset-simple.h"
24-
2524
static inline struct reset_simple_data *
2625
to_reset_simple_data(struct reset_controller_dev *rcdev)
2726
{

drivers/reset/reset-socfpga.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
#include <linux/of_address.h>
1212
#include <linux/platform_device.h>
1313
#include <linux/reset-controller.h>
14+
#include <linux/reset/reset-simple.h>
1415
#include <linux/reset/socfpga.h>
1516
#include <linux/slab.h>
1617
#include <linux/spinlock.h>
1718
#include <linux/types.h>
1819

19-
#include "reset-simple.h"
20-
2120
#define SOCFPGA_NR_BANKS 8
2221

2322
static int a10_reset_init(struct device_node *np)

drivers/reset/reset-sunxi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
#include <linux/of_address.h>
1515
#include <linux/platform_device.h>
1616
#include <linux/reset-controller.h>
17+
#include <linux/reset/reset-simple.h>
1718
#include <linux/reset/sunxi.h>
1819
#include <linux/slab.h>
1920
#include <linux/spinlock.h>
2021
#include <linux/types.h>
2122

22-
#include "reset-simple.h"
23-
2423
static int sunxi_reset_init(struct device_node *np)
2524
{
2625
struct reset_simple_data *data;

drivers/reset/reset-uniphier-glue.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
#include <linux/of_device.h>
1010
#include <linux/platform_device.h>
1111
#include <linux/reset.h>
12-
13-
#include "reset-simple.h"
12+
#include <linux/reset/reset-simple.h>
1413

1514
#define MAX_CLKS 2
1615
#define MAX_RSTS 2
File renamed without changes.

0 commit comments

Comments
 (0)