diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
commit | 448cc2fb3a7b327823a9afd374808c37b8e6194f (patch) | |
tree | a6d8ca3fa389980b47a495df2fb10892157c7dbc /drivers/misc/ad525x_dpot.c | |
parent | 527bab0473f28236e4587c7870586275c1ef5516 (diff) | |
parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
download | linux-448cc2fb3a7b327823a9afd374808c37b8e6194f.tar.xz |
Merge drm/drm-next into drm-intel-next
Sync up with drm-next to get v5.16-rc2.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/misc/ad525x_dpot.c')
-rw-r--r-- | drivers/misc/ad525x_dpot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c index 5d8f3f6a95f2..756ef6912b5a 100644 --- a/drivers/misc/ad525x_dpot.c +++ b/drivers/misc/ad525x_dpot.c @@ -743,7 +743,7 @@ exit: } EXPORT_SYMBOL(ad_dpot_probe); -int ad_dpot_remove(struct device *dev) +void ad_dpot_remove(struct device *dev) { struct dpot_data *data = dev_get_drvdata(dev); int i; @@ -753,8 +753,6 @@ int ad_dpot_remove(struct device *dev) ad_dpot_remove_files(dev, data->feat, i); kfree(data); - - return 0; } EXPORT_SYMBOL(ad_dpot_remove); |