Merge tag 'zte-drivers-4.12' of... (63466c49) · Commits · 戴 / test

Merge tag 'zte-drivers-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers ZTE driver updates for 4.12: It includes a couple of small cleanups on zx296718 power domain drivers. * tag 'zte-drivers-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux : soc: zte: pm_domains: Remove .owner field for driver soc: zte: pm_domains: Remove redundant dev_err call in zx2967_pd_probe() Signed-off-by:

drivers/soc/zte/zx296718_pm_domains.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ static const struct of_device_id zx296718_pm_domain_matches[] = {
		static struct platform_driver zx296718_pd_driver = {
		.driver = {
		.name = "zx296718-powerdomain",
		.owner = THIS_MODULE,
		.of_match_table = zx296718_pm_domain_matches,
		},
		.probe = zx296718_pd_probe,

+1 −3

Original line number	Diff line number	Diff line
		@@ -125,10 +125,8 @@ int zx2967_pd_probe(struct platform_device *pdev,

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		pcubase = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(pcubase)) {
		dev_err(&pdev->dev, "ioremap fail.\n");
		if (IS_ERR(pcubase))
		return PTR_ERR(pcubase);
		}

		for (i = 0; i < domain_num; ++i) {
		zx_pm_domains[i]->power_on = zx2967_power_on;