| Message ID | 20220706102851.2451164-1-Vijendar.Mukunda@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/3] drm/amdgpu: fix for coding style issues | expand |
Am 06.07.22 um 12:28 schrieb Vijendar Mukunda: > 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@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> > > --- > changes since v2: > - Removed Null check for apd structure > - Modified commit message > changes since v1: > - Modified commit label as drm/amdgpu > > drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 35 +++++++++---------------- > 1 file changed, 12 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c > index cc9c9f8b23b2..ceda19152c77 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c > @@ -128,16 +128,14 @@ 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) { > - adev = apd->adev; > + adev = apd->adev; > /* call smu to POWER GATE ACP block > * smu will > * 1. turn off the acp clock > * 2. power off the acp tiles > * 3. check and enter ulv state > */ > - amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, true); > - } > + amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, true); > return 0; > } > > @@ -147,16 +145,14 @@ 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) { > - adev = apd->adev; > + adev = apd->adev; > /* call smu to UNGATE ACP block > * smu will > * 1. exit ulv > * 2. turn on acp clock > * 3. power on acp tiles > */ > - amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, false); > - } > + amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, false); > return 0; > } > > @@ -193,7 +189,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 +216,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 +337,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 +536,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,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c index cc9c9f8b23b2..ceda19152c77 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c @@ -128,16 +128,14 @@ 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) { - adev = apd->adev; + adev = apd->adev; /* call smu to POWER GATE ACP block * smu will * 1. turn off the acp clock * 2. power off the acp tiles * 3. check and enter ulv state */ - amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, true); - } + amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, true); return 0; } @@ -147,16 +145,14 @@ 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) { - adev = apd->adev; + adev = apd->adev; /* call smu to UNGATE ACP block * smu will * 1. exit ulv * 2. turn on acp clock * 3. power on acp tiles */ - amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, false); - } + amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, false); return 0; } @@ -193,7 +189,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 +216,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 +337,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 +536,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,
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@amd.com> --- changes since v2: - Removed Null check for apd structure - Modified commit message changes since v1: - Modified commit label as drm/amdgpu drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 35 +++++++++---------------- 1 file changed, 12 insertions(+), 23 deletions(-)