[PATCH 1/3] mfd: da9053: remove references to nonexistent cdev member

[PATCH 1/3] mfd: da9053: remove references to nonexistent cdev member

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/mfd/da9053.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/da9053.c b/drivers/mfd/da9053.c
index 3fb5295cf910..250c0556ec3c 100644
--- a/drivers/mfd/da9053.c
+++ b/drivers/mfd/da9053.c
@@ -149,7 +149,7 @@ static int da9053_enable_multiwrite(struct da9053_priv *da9053)
 static int da9053_set_timeout(struct watchdog *wd, unsigned timeout)
 {
 	struct da9053_priv *da9053 = wd_to_da9053_priv(wd);
-	struct device_d *dev = da9053->cdev.dev;
+	struct device_d *dev = da9053->dev;
 	unsigned scale = 0;
 	int ret;
 	u8 val;
@@ -269,7 +269,6 @@ static int da9053_probe(struct device_d *dev)
 
 	da9053 = xzalloc(sizeof(*da9053));
 	da9053->dev = dev;
-	da9053->cdev.name = DRIVERNAME;
 	da9053->client = to_i2c_client(dev);
 	da9053->wd.set_timeout = da9053_set_timeout;
 	da9053->wd.priority = of_get_watchdog_priority(dev->device_node);
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] wd: add stub for of_get_watchdog_priority

[Lucas Stach]

Allow drivers to build even if WD core isn't enabled.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/watchdog.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/watchdog.h b/include/watchdog.h
index 6fd896734b4b..3e8a487a4de9 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -25,6 +25,7 @@ struct watchdog {
 int watchdog_register(struct watchdog *);
 int watchdog_deregister(struct watchdog *);
 int watchdog_set_timeout(unsigned);
+unsigned int of_get_watchdog_priority(struct device_node *node);
 #else
 static inline int watchdog_register(struct watchdog *w)
 {
@@ -40,10 +41,13 @@ static inline int watchdog_set_timeout(unsigned t)
 {
 	return 0;
 }
+
+static inline unsigned int of_get_watchdog_priority(struct device_node *node)
+{
+	return 0;
+}
 #endif
 
 #define WATCHDOG_DEFAULT_PRIORITY 100
 
-unsigned int of_get_watchdog_priority(struct device_node *node);
-
 #endif /* INCLUDE_WATCHDOG_H */
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] reset-source: add stub for of_get_reset_source_priority

[Lucas Stach]

Allow drivers to build even if reset source support isn't built in.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/reset_source.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/reset_source.h b/include/reset_source.h
index d484836dff0c..3ff06b70ad1f 100644
--- a/include/reset_source.h
+++ b/include/reset_source.h
@@ -27,6 +27,7 @@ enum reset_src_type {
 #ifdef CONFIG_RESET_SOURCE
 void reset_source_set_priority(enum reset_src_type, unsigned int priority);
 enum reset_src_type reset_source_get(void);
+unsigned int of_get_reset_source_priority(struct device_node *node);
 #else
 static inline void reset_source_set_priority(enum reset_src_type type,
 		unsigned int priority)
@@ -37,6 +38,11 @@ static inline enum reset_src_type reset_source_get(void)
 {
 	return RESET_UKWN;
 }
+
+static inline unsigned int of_get_reset_source_priority(struct device_node *node)
+{
+	return 0;
+}
 #endif
 
 #define RESET_SOURCE_DEFAULT_PRIORITY 100
@@ -46,6 +52,4 @@ static inline void reset_source_set(enum reset_src_type type)
 	reset_source_set_priority(type, RESET_SOURCE_DEFAULT_PRIORITY);
 }
 
-unsigned int of_get_reset_source_priority(struct device_node *node);
-
 #endif /* __INCLUDE_RESET_SOURCE_H */
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/3] mfd: da9053: remove references to nonexistent cdev member

[Sascha Hauer]

On Thu, Sep 03, 2015 at 10:00:54AM +0200, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/mfd/da9053.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox