diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-09 15:41:42 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-09 15:41:42 -0700 |
| commit | 9738031561d246f625325badb03a1f1eca2d1b01 (patch) | |
| tree | 1a352ee1d133b0f16729154e203e269c0387136a | |
| parent | 5d44595c2627f7edcd8c24a76b13bd115f9fc2da (diff) | |
| parent | f319cb8491e1b4cc44e7baeeb3ae7817dedf57fc (diff) | |
Merge tag 'reset-for-4.3-fixes' of git://git.pengutronix.de/git/pza/linux into drivers/reset
Merge "Reset controller fixes for v4.3" from Philipp Zabel:
Reset controller fixes for v4.3
- added stubs to avoid build breakage in COMPILE_TEST
configurations with RESET_CONTROLLER disabled
- fixed missing spinlock initialization in ath79 driver
* tag 'reset-for-4.3-fixes' of git://git.pengutronix.de/git/pza/linux:
reset: ath79: Fix missing spin_lock_init
reset: Add (devm_)reset_control_get stub functions
| -rw-r--r-- | drivers/reset/reset-ath79.c | 1 | ||||
| -rw-r--r-- | include/linux/reset.h | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/reset/reset-ath79.c b/drivers/reset/reset-ath79.c index d2d290413113..9aaf646ece55 100644 --- a/drivers/reset/reset-ath79.c +++ b/drivers/reset/reset-ath79.c @@ -89,6 +89,7 @@ static int ath79_reset_probe(struct platform_device *pdev) if (IS_ERR(ath79_reset->base)) return PTR_ERR(ath79_reset->base); + spin_lock_init(&ath79_reset->lock); ath79_reset->rcdev.ops = &ath79_reset_ops; ath79_reset->rcdev.owner = THIS_MODULE; ath79_reset->rcdev.of_node = pdev->dev.of_node; diff --git a/include/linux/reset.h b/include/linux/reset.h index da5602bd77d7..7f65f9cff951 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -74,6 +74,20 @@ static inline int device_reset_optional(struct device *dev) return -ENOSYS; } +static inline struct reset_control *__must_check reset_control_get( + struct device *dev, const char *id) +{ + WARN_ON(1); + return ERR_PTR(-EINVAL); +} + +static inline struct reset_control *__must_check devm_reset_control_get( + struct device *dev, const char *id) +{ + WARN_ON(1); + return ERR_PTR(-EINVAL); +} + static inline struct reset_control *reset_control_get_optional( struct device *dev, const char *id) { |