Commit 5b19211d authored by Jithu Joseph's avatar Jithu Joseph Committed by Aichun Shi
Browse files

platform/x86/intel/ifs: Remove reload sysfs entry 

mainline inclusion
from mainline-v6.2-rc1
commit bf835ee8
category: feature
feature: Backport Intel In Field Scan(IFS) multi-blob images support
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6L337
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/


commit/?id=bf835ee8

Intel-SIG: commit bf835ee8 ("platform/x86/intel/ifs: Remove reload sysfs entry")

-------------------------------------

platform/x86/intel/ifs: Remove reload sysfs entry

Reload sysfs entry will be replaced by current_batch, drop it.

Signed-off-by: default avatarJithu Joseph <jithu.joseph@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20221117035935.4136738-14-jithu.joseph@intel.com


Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent fc393c2f

drivers/platform/x86/intel/ifs/sysfs.c

+0 −29
Original line number Diff line number Diff line
@@ -87,34 +87,6 @@ static ssize_t run_test_store(struct device *dev, 


static DEVICE_ATTR_WO(run_test);



/*

 * Reload the IFS image. When user wants to install new IFS image

 */

static ssize_t reload_store(struct device *dev,

			    struct device_attribute *attr,

			    const char *buf, size_t count)

{

	struct ifs_data *ifsd = ifs_get_data(dev);

	bool res;





	if (kstrtobool(buf, &res))

		return -EINVAL;

	if (!res)

		return count;



	if (down_interruptible(&ifs_sem))

		return -EINTR;



	ifs_load_firmware(dev);



	up(&ifs_sem);



	return ifsd->loaded ? count : -ENODEV;

}



static DEVICE_ATTR_WO(reload);



/*

 * Display currently loaded IFS image version.

 */
@@ -136,7 +108,6 @@ static struct attribute *plat_ifs_attrs[] = { 
	&dev_attr_details.attr,

	&dev_attr_status.attr,

	&dev_attr_run_test.attr,

	&dev_attr_reload.attr,

	&dev_attr_image_version.attr,

	NULL

};