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

Merge tag 'fpga-for-7.1-rc1' of... 

Merge tag 'fpga-for-7.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into char-misc-next

Xu writes:

FPGA Manager changes for 7.1-rc1

- Dinh & Yury's changes to use sysfs_emit() for sysfs read

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

Sorry for the late post due to personal affairs.

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-7.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: m10bmc-sec: switch show_canceled_csk() to using sysfs_emit()
  fpga: bridge: Use sysfs_emit() instead of sprintf()
parents a5a18043 f63ddbcc

drivers/fpga/fpga-bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static ssize_t name_show(struct device *dev, 
{

	struct fpga_bridge *bridge = to_fpga_bridge(dev);



	return sprintf(buf, "%s\n", bridge->name);

	return sysfs_emit(buf, "%s\n", bridge->name);

}



static ssize_t state_show(struct device *dev,

drivers/fpga/intel-m10-bmc-sec-update.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ show_canceled_csk(struct device *dev, u32 addr, char *buf) 


	bitmap_from_arr32(csk_map, csk32, CSK_BIT_LEN);

	bitmap_complement(csk_map, csk_map, CSK_BIT_LEN);

	return bitmap_print_to_pagebuf(1, buf, csk_map, CSK_BIT_LEN);

	return sysfs_emit(buf, "%*pbl\n", CSK_BIT_LEN, csk_map);

}



#define DEVICE_ATTR_SEC_CSK_RO(_name)						\