RE: [PATCH] drm: amd: amdgpu: fix checkpatch warnings

From: Deucher, Alexander
Date: Mon Jun 27 2022 - 14:22:16 EST


[AMD Official Use Only - General]

> -----Original Message-----
> From: Deucher, Alexander
> Sent: Monday, June 27, 2022 2:18 PM
> To: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>; broonie@xxxxxxxxxx;
> alsa-devel@xxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx; amd-
> gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Dommati, Sunil-kumar <Sunil-kumar.Dommati@xxxxxxx>; David Airlie
> <airlied@xxxxxxxx>; Hiregoudar, Basavaraj <Basavaraj.Hiregoudar@xxxxxxx>;
> Pan, Xinhui <Xinhui.Pan@xxxxxxx>; open list <linux-
> kernel@xxxxxxxxxxxxxxx>; Kai-Heng Feng <kai.heng.feng@xxxxxxxxxxxxx>;
> Daniel Vetter <daniel@xxxxxxxx>; Mukunda, Vijendar
> <Vijendar.Mukunda@xxxxxxx>; Koenig, Christian
> <Christian.Koenig@xxxxxxx>
> Subject: RE: [PATCH] drm: amd: amdgpu: fix checkpatch warnings
>
> [AMD Official Use Only - General]
>
> > -----Original Message-----
> > From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of
> > Vijendar Mukunda
> > Sent: Monday, June 27, 2022 8:59 AM
> > To: broonie@xxxxxxxxxx; alsa-devel@xxxxxxxxxxxxxxxx; dri-
> > devel@xxxxxxxxxxxxxxxxxxxxx; amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> > Cc: Dommati, Sunil-kumar <Sunil-kumar.Dommati@xxxxxxx>; David Airlie
> > <airlied@xxxxxxxx>; Hiregoudar, Basavaraj
> > <Basavaraj.Hiregoudar@xxxxxxx>; Pan, Xinhui <Xinhui.Pan@xxxxxxx>;
> open
> > list <linux- kernel@xxxxxxxxxxxxxxx>; Kai-Heng Feng
> > <kai.heng.feng@xxxxxxxxxxxxx>; Daniel Vetter <daniel@xxxxxxxx>;
> > Mukunda, Vijendar <Vijendar.Mukunda@xxxxxxx>; Deucher, Alexander
> > <Alexander.Deucher@xxxxxxx>; Koenig, Christian
> > <Christian.Koenig@xxxxxxx>
> > Subject: [PATCH] drm: amd: amdgpu: fix checkpatch warnings
> >
> > From: vijendar <vijendar.mukunda@xxxxxxx>
> >
> > Fixed below checkpatch warnings and errors
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:131: CHECK: Comparison to
> NULL
> > could be written "apd"
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:150: CHECK: Comparison to
> NULL
> > could be written "apd"
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:196: CHECK: Prefer kernel
> type
> > 'u64' over 'uint64_t'
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:224: CHECK: Please don't use
> > multiple blank lines
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:226: CHECK: Comparison to
> NULL
> > could be written "!adev->acp.acp_genpd"
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:233: CHECK: Please don't use
> > multiple blank lines
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:239: CHECK: Alignment
> should
> > match open parenthesis
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:241: CHECK: Comparison to
> NULL
> > could be written "!adev->acp.acp_cell"
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:247: CHECK: Comparison to
> NULL
> > could be written "!adev->acp.acp_res"
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:253: CHECK: Comparison to
> NULL
> > could be written "!i2s_pdata"
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:350: CHECK: Alignment
> should
> > match open parenthesis
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c:550: ERROR: that open brace
> {
> > should be on the previous line
> >
> > Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
>
> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
>

I'm also fine to have this go through the audio tree if it is a pre-requisite for your jadeite audio series.

Alex

> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 27
> > +++++++++----------------
> > 1 file changed, 10 insertions(+), 17 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > index cc9c9f8b23b2..ba1605ff521f 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > @@ -128,7 +128,7 @@ static int acp_poweroff(struct generic_pm_domain
> > *genpd)
> > struct amdgpu_device *adev;
> >
> > apd = container_of(genpd, struct acp_pm_domain, gpd);
> > - if (apd != NULL) {
> > + if (apd) {
> > adev = apd->adev;
> > /* call smu to POWER GATE ACP block
> > * smu will
> > @@ -147,7 +147,7 @@ static int acp_poweron(struct generic_pm_domain
> > *genpd)
> > struct amdgpu_device *adev;
> >
> > apd = container_of(genpd, struct acp_pm_domain, gpd);
> > - if (apd != NULL) {
> > + if (apd) {
> > adev = apd->adev;
> > /* call smu to UNGATE ACP block
> > * smu will
> > @@ -193,7 +193,7 @@ static int acp_genpd_remove_device(struct device
> > *dev, void *data) static int acp_hw_init(void *handle) {
> > int r;
> > - uint64_t acp_base;
> > + u64 acp_base;
> > u32 val = 0;
> > u32 count = 0;
> > struct i2s_platform_data *i2s_pdata = NULL; @@ -220,37 +220,32
> @@
> > static int acp_hw_init(void *handle)
> > return -EINVAL;
> >
> > acp_base = adev->rmmio_base;
> > -
> > -
> > adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain),
> > GFP_KERNEL);
> > - if (adev->acp.acp_genpd == NULL)
> > + if (!adev->acp.acp_genpd)
> > return -ENOMEM;
> >
> > adev->acp.acp_genpd->gpd.name = "ACP_AUDIO";
> > adev->acp.acp_genpd->gpd.power_off = acp_poweroff;
> > adev->acp.acp_genpd->gpd.power_on = acp_poweron;
> > -
> > -
> > adev->acp.acp_genpd->adev = adev;
> >
> > pm_genpd_init(&adev->acp.acp_genpd->gpd, NULL, false);
> >
> > - adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell),
> > - GFP_KERNEL);
> > + adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell),
> > +GFP_KERNEL);
> >
> > - if (adev->acp.acp_cell == NULL) {
> > + if (!adev->acp.acp_cell) {
> > r = -ENOMEM;
> > goto failure;
> > }
> >
> > adev->acp.acp_res = kcalloc(5, sizeof(struct resource), GFP_KERNEL);
> > - if (adev->acp.acp_res == NULL) {
> > + if (!adev->acp.acp_res) {
> > r = -ENOMEM;
> > goto failure;
> > }
> >
> > i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data), GFP_KERNEL);
> > - if (i2s_pdata == NULL) {
> > + if (!i2s_pdata) {
> > r = -ENOMEM;
> > goto failure;
> > }
> > @@ -346,8 +341,7 @@ static int acp_hw_init(void *handle)
> > adev->acp.acp_cell[3].platform_data = &i2s_pdata[2];
> > adev->acp.acp_cell[3].pdata_size = sizeof(struct i2s_platform_data);
> >
> > - r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell,
> > - ACP_DEVS);
> > + r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell,
> > +ACP_DEVS);
> > if (r)
> > goto failure;
> >
> > @@ -546,8 +540,7 @@ static const struct amd_ip_funcs acp_ip_funcs = {
> > .set_powergating_state = acp_set_powergating_state, };
> >
> > -const struct amdgpu_ip_block_version acp_ip_block = -{
> > +const struct amdgpu_ip_block_version acp_ip_block = {
> > .type = AMD_IP_BLOCK_TYPE_ACP,
> > .major = 2,
> > .minor = 2,
> > --
> > 2.25.1