diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:45 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:45 +0100 |
| commit | 28e374e062aede65b6bb6f341376f196e5ac4fc7 (patch) | |
| tree | 603f97f7495cc6c234482424fcb4b39dc77369da /drivers/mfd | |
| parent | 4b05f14d96afde2fb8e7e9a92893ca3c684870d0 (diff) | |
| parent | aade8d53cf6cccf7958d2c11e5791dfcd85a584f (diff) | |
| download | barebox-28e374e062aede65b6bb6f341376f196e5ac4fc7.tar.gz barebox-28e374e062aede65b6bb6f341376f196e5ac4fc7.tar.xz | |
Merge branch 'for-next/watchdog'
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/da9053.c | 1 | ||||
| -rw-r--r-- | drivers/mfd/da9063.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mfd/da9053.c b/drivers/mfd/da9053.c index 4c31beb267..1f32869038 100644 --- a/drivers/mfd/da9053.c +++ b/drivers/mfd/da9053.c @@ -271,7 +271,6 @@ static int da9053_probe(struct device_d *dev) da9053->dev = dev; da9053->client = to_i2c_client(dev); da9053->wd.set_timeout = da9053_set_timeout; - da9053->wd.priority = of_get_watchdog_priority(dev->device_node); da9053->wd.hwdev = dev; ret = da9053_enable_multiwrite(da9053); diff --git a/drivers/mfd/da9063.c b/drivers/mfd/da9063.c index 967ca9ac51..e48c38affa 100644 --- a/drivers/mfd/da9063.c +++ b/drivers/mfd/da9063.c @@ -377,7 +377,6 @@ static int da9063_probe(struct device_d *dev) dev_data = ret < 0 ? NULL : dev_data_tmp; priv = xzalloc(sizeof(struct da9063)); - priv->wd.priority = of_get_watchdog_priority(dev->device_node); priv->wd.set_timeout = da9063_watchdog_set_timeout; priv->wd.hwdev = dev; priv->timeout = DA9063_INITIAL_TIMEOUT; |