diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:28:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:28:49 +0100 |
| commit | 3c40bc8c26beac31ada80efa99b60d49b27da64a (patch) | |
| tree | 584107042d615e3261f92206202b5fba3890324f /include | |
| parent | 9fdf56c8d47d1084fef065f2a234a9b42c694279 (diff) | |
| parent | d9ba9c92b72b1c795da524becd41859450aafc1a (diff) | |
| download | barebox-3c40bc8c26beac31ada80efa99b60d49b27da64a.tar.gz barebox-3c40bc8c26beac31ada80efa99b60d49b27da64a.tar.xz | |
Merge branch 'for-next/reset'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/reset.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h index f6c475c68b..be0d1bb5a6 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -15,16 +15,7 @@ void reset_control_put(struct reset_control *rstc); int __must_check device_reset(struct device_d *dev); -static inline int device_reset_optional(struct device_d *dev) -{ - return device_reset(dev); -} - -static inline struct reset_control *reset_control_get_optional( - struct device_d *dev, const char *id) -{ - return reset_control_get(dev, id); -} +int __must_check device_reset_us(struct device_d *dev, int us); #else @@ -51,15 +42,10 @@ static inline void reset_control_put(struct reset_control *rstc) WARN_ON(1); } -static inline int device_reset_optional(struct device_d *dev) +static inline int device_reset_us(struct device_d *dev, int us) { - return -ENOSYS; -} - -static inline struct reset_control *reset_control_get_optional( - struct device_d *dev, const char *id) -{ - return ERR_PTR(-ENOSYS); + WARN_ON(1); + return 0; } #endif /* CONFIG_RESET_CONTROLLER */ |