Commit 97380315 authored by Kevin Hilman's avatar Kevin Hilman

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
parents 5d44595c f319cb84
...@@ -89,6 +89,7 @@ static int ath79_reset_probe(struct platform_device *pdev) ...@@ -89,6 +89,7 @@ static int ath79_reset_probe(struct platform_device *pdev)
if (IS_ERR(ath79_reset->base)) if (IS_ERR(ath79_reset->base))
return PTR_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.ops = &ath79_reset_ops;
ath79_reset->rcdev.owner = THIS_MODULE; ath79_reset->rcdev.owner = THIS_MODULE;
ath79_reset->rcdev.of_node = pdev->dev.of_node; ath79_reset->rcdev.of_node = pdev->dev.of_node;
......
...@@ -74,6 +74,20 @@ static inline int device_reset_optional(struct device *dev) ...@@ -74,6 +74,20 @@ static inline int device_reset_optional(struct device *dev)
return -ENOSYS; 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( static inline struct reset_control *reset_control_get_optional(
struct device *dev, const char *id) struct device *dev, const char *id)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment