Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
On Tue, May 23, 2023 at 3:51 PM Srinivasan Shanmugam
<srinivasan.shanmugam@xxxxxxx> wrote:
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> WARNING: braces {} are not necessary for any arm of this statement
> + if (nvec <= 0) {
> [...]
> + } else {
> [...]
> WARNING: Block comments use a trailing */ on a separate line
>
> Cc: Christian König <christian.koenig@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 27 +++++++++++++------------
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> index ad5368e15114..00f2106c17b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> @@ -125,7 +125,7 @@ const int node_id_to_phys_map[NODEID_MAX] = {
> void amdgpu_irq_disable_all(struct amdgpu_device *adev)
> {
> unsigned long irqflags;
> - unsigned i, j, k;
> + unsigned int i, j, k;
> int r;
>
> spin_lock_irqsave(&adev->irq.lock, irqflags);
> @@ -284,11 +284,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
> int nvec = pci_msix_vec_count(adev->pdev);
> unsigned int flags;
>
> - if (nvec <= 0) {
> + if (nvec <= 0)
> flags = PCI_IRQ_MSI;
> - } else {
> + else
> flags = PCI_IRQ_MSI | PCI_IRQ_MSIX;
> - }
> +
> /* we only need one vector */
> nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, flags);
> if (nvec > 0) {
> @@ -347,7 +347,7 @@ void amdgpu_irq_fini_hw(struct amdgpu_device *adev)
> */
> void amdgpu_irq_fini_sw(struct amdgpu_device *adev)
> {
> - unsigned i, j;
> + unsigned int i, j;
>
> for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {
> if (!adev->irq.client[i].sources)
> @@ -381,7 +381,7 @@ void amdgpu_irq_fini_sw(struct amdgpu_device *adev)
> * 0 on success or error code otherwise
> */
> int amdgpu_irq_add_id(struct amdgpu_device *adev,
> - unsigned client_id, unsigned src_id,
> + unsigned int client_id, unsigned int src_id,
> struct amdgpu_irq_src *source)
> {
> if (client_id >= AMDGPU_IRQ_CLIENTID_MAX)
> @@ -433,7 +433,7 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev,
> {
> u32 ring_index = ih->rptr >> 2;
> struct amdgpu_iv_entry entry;
> - unsigned client_id, src_id;
> + unsigned int client_id, src_id;
> struct amdgpu_irq_src *src;
> bool handled = false;
> int r;
> @@ -508,7 +508,7 @@ void amdgpu_irq_delegate(struct amdgpu_device *adev,
> * Updates interrupt state for the specific source (all ASICs).
> */
> int amdgpu_irq_update(struct amdgpu_device *adev,
> - struct amdgpu_irq_src *src, unsigned type)
> + struct amdgpu_irq_src *src, unsigned int type)
> {
> unsigned long irqflags;
> enum amdgpu_interrupt_state state;
> @@ -517,7 +517,8 @@ int amdgpu_irq_update(struct amdgpu_device *adev,
> spin_lock_irqsave(&adev->irq.lock, irqflags);
>
> /* We need to determine after taking the lock, otherwise
> - we might disable just enabled interrupts again */
> + * we might disable just enabled interrupts again
> + */
> if (amdgpu_irq_enabled(adev, src, type))
> state = AMDGPU_IRQ_STATE_ENABLE;
> else
> @@ -571,7 +572,7 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev)
> * 0 on success or error code otherwise
> */
> int amdgpu_irq_get(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
> - unsigned type)
> + unsigned int type)
> {
> if (!adev->irq.installed)
> return -ENOENT;
> @@ -601,7 +602,7 @@ int amdgpu_irq_get(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
> * 0 on success or error code otherwise
> */
> int amdgpu_irq_put(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
> - unsigned type)
> + unsigned int type)
> {
> if (!adev->irq.installed)
> return -ENOENT;
> @@ -635,7 +636,7 @@ int amdgpu_irq_put(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
> * invalid parameters
> */
> bool amdgpu_irq_enabled(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
> - unsigned type)
> + unsigned int type)
> {
> if (!adev->irq.installed)
> return false;
> @@ -748,7 +749,7 @@ void amdgpu_irq_remove_domain(struct amdgpu_device *adev)
> * Returns:
> * Linux IRQ
> */
> -unsigned amdgpu_irq_create_mapping(struct amdgpu_device *adev, unsigned src_id)
> +unsigned int amdgpu_irq_create_mapping(struct amdgpu_device *adev, unsigned int src_id)
> {
> adev->irq.virq[src_id] = irq_create_mapping(adev->irq.domain, src_id);
>
> --
> 2.25.1
>
