tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Moritz 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

Greg Kroah-Hartman 09381eb1 591afd6e

+4 -6
+3 -3
drivers/fpga/dfl-fme-perf.c
··· 192 192 NULL, 193 193 }; 194 194 195 - static struct attribute_group fme_perf_cpumask_group = { 195 + static const struct attribute_group fme_perf_cpumask_group = { 196 196 .attrs = fme_perf_cpumask_attrs, 197 197 }; 198 198 ··· 225 225 NULL, 226 226 }; 227 227 228 - static struct attribute_group fme_perf_format_group = { 228 + static const struct attribute_group fme_perf_format_group = { 229 229 .name = "format", 230 230 .attrs = fme_perf_format_attrs, 231 231 }; ··· 239 239 NULL, 240 240 }; 241 241 242 - static struct attribute_group fme_perf_events_group = { 242 + static const struct attribute_group fme_perf_events_group = { 243 243 .name = "events", 244 244 .attrs = fme_perf_events_attrs_empty, 245 245 };
+1 -3
drivers/fpga/fpga-bridge.c
··· 17 17 static struct class *fpga_bridge_class; 18 18 19 19 /* Lock for adding/removing bridges to linked lists*/ 20 - static spinlock_t bridge_list_lock; 20 + static DEFINE_SPINLOCK(bridge_list_lock); 21 21 22 22 /** 23 23 * fpga_bridge_enable - Enable transactions on the bridge ··· 479 479 480 480 static int __init fpga_bridge_dev_init(void) 481 481 { 482 - spin_lock_init(&bridge_list_lock); 483 - 484 482 fpga_bridge_class = class_create(THIS_MODULE, "fpga_bridge"); 485 483 if (IS_ERR(fpga_bridge_class)) 486 484 return PTR_ERR(fpga_bridge_class);