diff --git a/drivers/reset/core.c b/drivers/reset/core.c index c79cce3a7b6d1b63ac478f29487c46110507b129..71ccf281dce39587b4c46a6d8b157fdbfb09a537 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -392,7 +392,7 @@ EXPORT_SYMBOL_GPL(__of_reset_control_get); void reset_control_put(struct reset_control *rstc) { - if (IS_ERR(rstc)) + if (IS_ERR_OR_NULL(rstc)) return; mutex_lock(&reset_list_mutex); diff --git a/drivers/reset/reset-zx2967.c b/drivers/reset/reset-zx2967.c index 5d821513aa3ef60b9f6083a2d67d3387eb344aac..4dabb9ec48418011d55a3dc6b96a513bb2ae54cd 100644 --- a/drivers/reset/reset-zx2967.c +++ b/drivers/reset/reset-zx2967.c @@ -8,7 +8,6 @@ * License terms: GNU General Public License (GPL) version 2 */ -#include #include #include #include @@ -89,7 +88,6 @@ static const struct of_device_id zx2967_reset_dt_ids[] = { { .compatible = "zte,zx296718-reset", }, {}, }; -MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids); static struct platform_driver zx2967_reset_driver = { .probe = zx2967_reset_probe, @@ -98,9 +96,4 @@ static struct platform_driver zx2967_reset_driver = { .of_match_table = zx2967_reset_dt_ids, }, }; - builtin_platform_driver(zx2967_reset_driver); - -MODULE_AUTHOR("Baoyou Xie "); -MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver"); -MODULE_LICENSE("GPL");