Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3382a622 authored by Andrew Donnellan's avatar Andrew Donnellan Committed by Michael Ellerman
Browse files

cxl: Fix coccinelle warnings 



Fix the following coccinelle warnings:

  drivers/misc/cxl/debugfs.c:46:0-23: WARNING: fops_io_x64 should be
      defined with DEFINE_DEBUGFS_ATTRIBUTE
  drivers/misc/cxl/guest.c:890:5-26: WARNING: Comparison to bool
  drivers/misc/cxl/irq.c:107:3-23: WARNING: Assignment of bool to 0/1
  drivers/misc/cxl/native.c:57:2-3: Unneeded semicolon
  drivers/misc/cxl/native.c:170:2-3: Unneeded semicolon

Signed-off-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: default avatarFrederic Barrat <fbarrat@linux.vnet.ibm.com>
Reviewed-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Acked-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 902e06eb

drivers/misc/cxl/debugfs.c

+4 −2
Original line number Diff line number Diff line
@@ -43,12 +43,14 @@ static int debugfs_io_u64_set(void *data, u64 val) 
	out_be64((u64 __iomem *)data, val);

	return 0;

}

DEFINE_SIMPLE_ATTRIBUTE(fops_io_x64, debugfs_io_u64_get, debugfs_io_u64_set, "0x%016llx\n");

DEFINE_DEBUGFS_ATTRIBUTE(fops_io_x64, debugfs_io_u64_get, debugfs_io_u64_set,

			 "0x%016llx\n");



static struct dentry *debugfs_create_io_x64(const char *name, umode_t mode,

					    struct dentry *parent, u64 __iomem *value)

{

	return debugfs_create_file(name, mode, parent, (void __force *)value, &fops_io_x64);

	return debugfs_create_file_unsafe(name, mode, parent,

					  (void __force *)value, &fops_io_x64);

}



void cxl_debugfs_add_adapter_psl_regs(struct cxl *adapter, struct dentry *dir)

drivers/misc/cxl/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ static void afu_handle_errstate(struct work_struct *work) 
	    afu_guest->previous_state == H_STATE_PERM_UNAVAILABLE)

		return;



	if (afu_guest->handle_err == true)

	if (afu_guest->handle_err)

		schedule_delayed_work(&afu_guest->work_err,

				      msecs_to_jiffies(3000));

}

drivers/misc/cxl/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ irqreturn_t cxl_irq(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_i 
		} else {

			spin_lock(&ctx->lock);

			ctx->afu_err = irq_info->afu_err;

			ctx->pending_afu_err = 1;

			ctx->pending_afu_err = true;

			spin_unlock(&ctx->lock);



			wake_up_all(&ctx->wq);

drivers/misc/cxl/native.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int afu_control(struct cxl_afu *afu, u64 command, u64 clear, 
				     AFU_Cntl | command);

		cpu_relax();

		AFU_Cntl = cxl_p2n_read(afu, CXL_AFU_Cntl_An);

	};

	}



	if (AFU_Cntl & CXL_AFU_Cntl_An_RA) {

		/*
@@ -167,7 +167,7 @@ int cxl_psl_purge(struct cxl_afu *afu) 
			cpu_relax();

		}

		PSL_CNTL = cxl_p1n_read(afu, CXL_PSL_SCNTL_An);

	};

	}

	end = local_clock();

	pr_devel("PSL purged in %lld ns\n", end - start);