diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 21:02:56 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 21:02:56 +0300 |
| commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
| tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /drivers/reset/hisilicon/hi6220_reset.c | |
| parent | 0bb11e969f5367dcb661f9fcc77efd5d58a2c470 (diff) | |
| parent | 6a5029e66404462a3322dba8e35615bd09332081 (diff) | |
| download | linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz | |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'drivers/reset/hisilicon/hi6220_reset.c')
| -rw-r--r-- | drivers/reset/hisilicon/hi6220_reset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index 7787a9b1cc67..8f55fd4a2630 100644 --- a/drivers/reset/hisilicon/hi6220_reset.c +++ b/drivers/reset/hisilicon/hi6220_reset.c @@ -57,7 +57,7 @@ static int hi6220_reset_deassert(struct reset_controller_dev *rc_dev, return 0; } -static struct reset_control_ops hi6220_reset_ops = { +static const struct reset_control_ops hi6220_reset_ops = { .assert = hi6220_reset_assert, .deassert = hi6220_reset_deassert, }; @@ -83,9 +83,7 @@ static int hi6220_reset_probe(struct platform_device *pdev) data->rc_dev.ops = &hi6220_reset_ops; data->rc_dev.of_node = pdev->dev.of_node; - reset_controller_register(&data->rc_dev); - - return 0; + return reset_controller_register(&data->rc_dev); } static const struct of_device_id hi6220_reset_match[] = { |