LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] drm: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
@ 2019-12-25 13:20 yu kuai
2019-12-27 11:54 ` Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: yu kuai @ 2019-12-25 13:20 UTC (permalink / raw)
To: tomi.valkeinen, airlied, daniel, mripard, wens, jernej.skrabec,
thierry.reding, jonathanh
Cc: dri-devel, linux-kernel, linux-arm-kernel, linux-tegra, yukuai3,
zhengbin13, yi.zhang
no functional change, just to make the code simpler
Signed-off-by: yu kuai <yukuai3@huawei.com>
---
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +----
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 6 ++----
drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 4 +---
drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 4 +---
drivers/gpu/drm/sun4i/sun4i_dotclock.c | 4 +---
drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 4 +---
drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 4 +---
drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c | 5 +----
drivers/gpu/drm/tegra/drm.c | 4 +---
drivers/gpu/drm/tegra/gem.c | 4 +---
10 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 0f557fad4513..eb71baedf19e 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -587,10 +587,7 @@ static int hdmi_audio_register(struct omap_hdmi *hdmi)
&hdmi->pdev->dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
&pdata, sizeof(pdata));
- if (IS_ERR(hdmi->audio_pdev))
- return PTR_ERR(hdmi->audio_pdev);
-
- return 0;
+ return PTR_ERR_OR_ZERO(hdmi->audio_pdev);
}
/* -----------------------------------------------------------------------------
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
index ea5d5c228534..fdd73fb73653 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
@@ -924,8 +924,6 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
core->base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(core->base))
- return PTR_ERR(core->base);
-
- return 0;
+
+ return PTR_ERR_OR_ZERO(core->base);
}
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index ff4d35c8771f..30454bc9de78 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -908,8 +908,6 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
core->base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(core->base))
- return PTR_ERR(core->base);
- return 0;
+ return PTR_ERR_OR_ZERO(core->base);
}
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index 00bbf24488c1..bbc02d5aa8fb 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@ -191,8 +191,6 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy,
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
phy->base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(phy->base))
- return PTR_ERR(phy->base);
- return 0;
+ return PTR_ERR_OR_ZERO(phy->base);
}
diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
index 417ade3d2565..84c04d8192b3 100644
--- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c
+++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
@@ -191,10 +191,8 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon)
dclk->hw.init = &init;
tcon->dclk = clk_register(dev, &dclk->hw);
- if (IS_ERR(tcon->dclk))
- return PTR_ERR(tcon->dclk);
- return 0;
+ return PTR_ERR_OR_ZERO(tcon->dclk);
}
EXPORT_SYMBOL(sun4i_dclk_create);
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c
index b66fa27fe6ea..12a7b7b1c99c 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c
@@ -278,10 +278,8 @@ static int sun4i_hdmi_init_regmap_fields(struct sun4i_hdmi *hdmi)
hdmi->field_ddc_sck_en =
devm_regmap_field_alloc(hdmi->dev, hdmi->regmap,
hdmi->variant->field_ddc_sck_en);
- if (IS_ERR(hdmi->field_ddc_sck_en))
- return PTR_ERR(hdmi->field_ddc_sck_en);
- return 0;
+ return PTR_ERR_OR_ZERO(hdmi->field_ddc_sck_en);
}
int sun4i_hdmi_i2c_create(struct device *dev, struct sun4i_hdmi *hdmi)
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
index fbf7da9d9592..41044f013933 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
@@ -229,8 +229,6 @@ int sun4i_tmds_create(struct sun4i_hdmi *hdmi)
tmds->div_offset = hdmi->variant->tmds_clk_div_offset;
hdmi->tmds_clk = devm_clk_register(hdmi->dev, &tmds->hw);
- if (IS_ERR(hdmi->tmds_clk))
- return PTR_ERR(hdmi->tmds_clk);
- return 0;
+ return PTR_ERR_OR_ZERO(hdmi->tmds_clk);
}
diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c
index a4d31fe3abff..0456b9c144ba 100644
--- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c
+++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c
@@ -169,10 +169,7 @@ int sun8i_phy_clk_create(struct sun8i_hdmi_phy *phy, struct device *dev,
priv->phy = phy;
priv->hw.init = &init;
-
phy->clk_phy = devm_clk_register(dev, &priv->hw);
- if (IS_ERR(phy->clk_phy))
- return PTR_ERR(phy->clk_phy);
- return 0;
+ return PTR_ERR_OR_ZERO(phy->clk_phy);
}
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index f455ce71e85d..15be6bfdfe0b 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -347,10 +347,8 @@ static int tegra_gem_create(struct drm_device *drm, void *data,
bo = tegra_bo_create_with_handle(file, drm, args->size, args->flags,
&args->handle);
- if (IS_ERR(bo))
- return PTR_ERR(bo);
- return 0;
+ return PTR_ERR_OR_ZERO(bo);
}
static int tegra_gem_mmap(struct drm_device *drm, void *data,
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 1237df157e05..0a1c96129b2f 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -462,10 +462,8 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
bo = tegra_bo_create_with_handle(file, drm, args->size, 0,
&args->handle);
- if (IS_ERR(bo))
- return PTR_ERR(bo);
- return 0;
+ return PTR_ERR_OR_ZERO(bo);
}
static vm_fault_t tegra_bo_fault(struct vm_fault *vmf)
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
2019-12-25 13:20 [PATCH] drm: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO yu kuai
@ 2019-12-27 11:54 ` Maxime Ripard
2020-01-07 6:47 ` Tomi Valkeinen
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2019-12-27 11:54 UTC (permalink / raw)
To: yu kuai
Cc: tomi.valkeinen, airlied, daniel, wens, jernej.skrabec,
thierry.reding, jonathanh, dri-devel, linux-kernel,
linux-arm-kernel, linux-tegra, zhengbin13, yi.zhang
[-- Attachment #1: Type: text/plain, Size: 3826 bytes --]
On Wed, Dec 25, 2019 at 09:20:42PM +0800, yu kuai wrote:
> no functional change, just to make the code simpler
>
> Signed-off-by: yu kuai <yukuai3@huawei.com>
> ---
> drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +----
> drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 6 ++----
> drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 4 +---
> drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 4 +---
> drivers/gpu/drm/sun4i/sun4i_dotclock.c | 4 +---
> drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 4 +---
> drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 4 +---
> drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c | 5 +----
> drivers/gpu/drm/tegra/drm.c | 4 +---
> drivers/gpu/drm/tegra/gem.c | 4 +---
> 10 files changed, 11 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> index 0f557fad4513..eb71baedf19e 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> @@ -587,10 +587,7 @@ static int hdmi_audio_register(struct omap_hdmi *hdmi)
> &hdmi->pdev->dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
> &pdata, sizeof(pdata));
>
> - if (IS_ERR(hdmi->audio_pdev))
> - return PTR_ERR(hdmi->audio_pdev);
> -
> - return 0;
> + return PTR_ERR_OR_ZERO(hdmi->audio_pdev);
> }
>
> /* -----------------------------------------------------------------------------
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
> index ea5d5c228534..fdd73fb73653 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
> @@ -924,8 +924,6 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
>
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
> core->base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(core->base))
> - return PTR_ERR(core->base);
> -
> - return 0;
> +
> + return PTR_ERR_OR_ZERO(core->base);
> }
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
> index ff4d35c8771f..30454bc9de78 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
> @@ -908,8 +908,6 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
>
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
> core->base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(core->base))
> - return PTR_ERR(core->base);
>
> - return 0;
> + return PTR_ERR_OR_ZERO(core->base);
> }
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
> index 00bbf24488c1..bbc02d5aa8fb 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
> @@ -191,8 +191,6 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy,
>
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
> phy->base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(phy->base))
> - return PTR_ERR(phy->base);
>
> - return 0;
> + return PTR_ERR_OR_ZERO(phy->base);
> }
> diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
> index 417ade3d2565..84c04d8192b3 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
> @@ -191,10 +191,8 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon)
> dclk->hw.init = &init;
>
> tcon->dclk = clk_register(dev, &dclk->hw);
> - if (IS_ERR(tcon->dclk))
> - return PTR_ERR(tcon->dclk);
>
> - return 0;
> + return PTR_ERR_OR_ZERO(tcon->dclk);
This has been submitted a couple of times already. It's harder to
maintain and not easier to read.
Please remove sun4i from your patch
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
2019-12-27 11:54 ` Maxime Ripard
@ 2020-01-07 6:47 ` Tomi Valkeinen
0 siblings, 0 replies; 3+ messages in thread
From: Tomi Valkeinen @ 2020-01-07 6:47 UTC (permalink / raw)
To: yu kuai
Cc: Maxime Ripard, airlied, daniel, wens, jernej.skrabec,
thierry.reding, jonathanh, dri-devel, linux-kernel,
linux-arm-kernel, linux-tegra, zhengbin13, yi.zhang
On 27/12/2019 13:54, Maxime Ripard wrote:
> On Wed, Dec 25, 2019 at 09:20:42PM +0800, yu kuai wrote:
>> no functional change, just to make the code simpler
>>
>> Signed-off-by: yu kuai <yukuai3@huawei.com>
>> ---
>> drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +----
>> drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 6 ++----
>> drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 4 +---
>> drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 4 +---
>> drivers/gpu/drm/sun4i/sun4i_dotclock.c | 4 +---
>> drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 4 +---
>> drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 4 +---
>> drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c | 5 +----
>> drivers/gpu/drm/tegra/drm.c | 4 +---
>> drivers/gpu/drm/tegra/gem.c | 4 +---
>> 10 files changed, 11 insertions(+), 33 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
>> index 0f557fad4513..eb71baedf19e 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
>> @@ -587,10 +587,7 @@ static int hdmi_audio_register(struct omap_hdmi *hdmi)
>> &hdmi->pdev->dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
>> &pdata, sizeof(pdata));
>>
>> - if (IS_ERR(hdmi->audio_pdev))
>> - return PTR_ERR(hdmi->audio_pdev);
>> -
>> - return 0;
>> + return PTR_ERR_OR_ZERO(hdmi->audio_pdev);
>> }
>>
>> /* -----------------------------------------------------------------------------
>> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
>> index ea5d5c228534..fdd73fb73653 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
>> @@ -924,8 +924,6 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
>>
>> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
>> core->base = devm_ioremap_resource(&pdev->dev, res);
>> - if (IS_ERR(core->base))
>> - return PTR_ERR(core->base);
>> -
>> - return 0;
>> +
>> + return PTR_ERR_OR_ZERO(core->base);
>> }
>> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
>> index ff4d35c8771f..30454bc9de78 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
>> @@ -908,8 +908,6 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
>>
>> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
>> core->base = devm_ioremap_resource(&pdev->dev, res);
>> - if (IS_ERR(core->base))
>> - return PTR_ERR(core->base);
>>
>> - return 0;
>> + return PTR_ERR_OR_ZERO(core->base);
>> }
>> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
>> index 00bbf24488c1..bbc02d5aa8fb 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
>> @@ -191,8 +191,6 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy,
>>
>> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
>> phy->base = devm_ioremap_resource(&pdev->dev, res);
>> - if (IS_ERR(phy->base))
>> - return PTR_ERR(phy->base);
>>
>> - return 0;
>> + return PTR_ERR_OR_ZERO(phy->base);
>> }
>> diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
>> index 417ade3d2565..84c04d8192b3 100644
>> --- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c
>> +++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c
>> @@ -191,10 +191,8 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon)
>> dclk->hw.init = &init;
>>
>> tcon->dclk = clk_register(dev, &dclk->hw);
>> - if (IS_ERR(tcon->dclk))
>> - return PTR_ERR(tcon->dclk);
>>
>> - return 0;
>> + return PTR_ERR_OR_ZERO(tcon->dclk);
>
> This has been submitted a couple of times already. It's harder to
> maintain and not easier to read.
>
> Please remove sun4i from your patch
Nack for the omapdrm parts too, for the same reasons.
Tomi
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-07 6:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-25 13:20 [PATCH] drm: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO yu kuai
2019-12-27 11:54 ` Maxime Ripard
2020-01-07 6:47 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).