Commit 97ef3b7f authored by Cai Huoqing's avatar Cai Huoqing Committed by Mauro Carvalho Chehab
Browse files

media: cec: ao-cec: Make use of the helper function devm_platform_ioremap_resource() 



Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f5aae241

drivers/media/cec/platform/meson/ao-cec-g12a.c

+1 −3
Original line number Diff line number Diff line
@@ -633,7 +633,6 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev) 
{

	struct meson_ao_cec_g12a_device *ao_cec;

	struct device *hdmi_dev;

	struct resource *res;

	void __iomem *base;

	int ret, irq;
@@ -664,8 +663,7 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev) 


	ao_cec->adap->owner = THIS_MODULE;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap_resource(&pdev->dev, res);

	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base)) {

		ret = PTR_ERR(base);

		goto out_probe_adapter;

drivers/media/cec/platform/meson/ao-cec.c

+1 −3
Original line number Diff line number Diff line
@@ -602,7 +602,6 @@ static int meson_ao_cec_probe(struct platform_device *pdev) 
{

	struct meson_ao_cec_device *ao_cec;

	struct device *hdmi_dev;

	struct resource *res;

	int ret, irq;



	hdmi_dev = cec_notifier_parse_hdmi_phandle(&pdev->dev);
@@ -626,8 +625,7 @@ static int meson_ao_cec_probe(struct platform_device *pdev) 


	ao_cec->adap->owner = THIS_MODULE;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ao_cec->base = devm_ioremap_resource(&pdev->dev, res);

	ao_cec->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ao_cec->base)) {

		ret = PTR_ERR(ao_cec->base);

		goto out_probe_adapter;