Commit 09381eb1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-cleanup-for-5.12' of... 

Merge tag 'fpga-cleanup-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga

 into char-misc-next

Moritz writes:

First set of FPGA Manager changes for 5.12-rc1

This is the first set of changes for the FPGA Manager 5.12-rc1
mergewindow.

DFL:
- Minor cleanup, constifying a static attribute group

Core:
- Minor cleanup, using DEFINE_SPINLOCK over open coding it

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of my for-next branch) without issues.

Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>

* tag 'fpga-cleanup-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  fpga: dfl: fme: Constify static attribute_group structs
  fpga: Use DEFINE_SPINLOCK() for spinlock
parents 591afd6e e41d4c01

drivers/fpga/dfl-fme-perf.c

+3 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static struct attribute *fme_perf_cpumask_attrs[] = { 
	NULL,

};



static struct attribute_group fme_perf_cpumask_group = {

static const struct attribute_group fme_perf_cpumask_group = {

	.attrs = fme_perf_cpumask_attrs,

};
@@ -225,7 +225,7 @@ static struct attribute *fme_perf_format_attrs[] = { 
	NULL,

};



static struct attribute_group fme_perf_format_group = {

static const struct attribute_group fme_perf_format_group = {

	.name = "format",

	.attrs = fme_perf_format_attrs,

};
@@ -239,7 +239,7 @@ static struct attribute *fme_perf_events_attrs_empty[] = { 
	NULL,

};



static struct attribute_group fme_perf_events_group = {

static const struct attribute_group fme_perf_events_group = {

	.name = "events",

	.attrs = fme_perf_events_attrs_empty,

};

drivers/fpga/fpga-bridge.c

+1 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static DEFINE_IDA(fpga_bridge_ida); 
static struct class *fpga_bridge_class;



/* Lock for adding/removing bridges to linked lists*/

static spinlock_t bridge_list_lock;

static DEFINE_SPINLOCK(bridge_list_lock);



/**

 * fpga_bridge_enable - Enable transactions on the bridge
@@ -479,8 +479,6 @@ static void fpga_bridge_dev_release(struct device *dev) 


static int __init fpga_bridge_dev_init(void)

{

	spin_lock_init(&bridge_list_lock);



	fpga_bridge_class = class_create(THIS_MODULE, "fpga_bridge");

	if (IS_ERR(fpga_bridge_class))

		return PTR_ERR(fpga_bridge_class);