diff options
author | Dave Jiang <dave.jiang@intel.com> | 2025-05-09 09:59:28 -0700 |
---|---|---|
committer | Dave Jiang <dave.jiang@intel.com> | 2025-05-09 09:59:28 -0700 |
commit | 68d8b4f399e78a7be2bc69530c7e4b3e79fde9db (patch) | |
tree | 088e0048b0625c12705e1cd51ddc9f957d04cb08 /drivers/cxl/core/memdev.c | |
parent | 8e62ba590160f91abba6490d9c17aa13bada4752 (diff) | |
parent | 98a863fee2406f92cf172659b2390212e72a3313 (diff) |
Merge branch 'for-6.16/cxl-cleanups' into cxl-for-next
In preparation for code changes related to AMD Zen5 address translation
support, a number of small code refactor and cleanups are send ahead.
Diffstat (limited to 'drivers/cxl/core/memdev.c')
-rw-r--r-- | drivers/cxl/core/memdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index a16a5886d40a..ca9e38b222c8 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -153,8 +153,8 @@ static ssize_t security_state_show(struct device *dev, return sysfs_emit(buf, "frozen\n"); if (state & CXL_PMEM_SEC_STATE_LOCKED) return sysfs_emit(buf, "locked\n"); - else - return sysfs_emit(buf, "unlocked\n"); + + return sysfs_emit(buf, "unlocked\n"); } static struct device_attribute dev_attr_security_state = __ATTR(state, 0444, security_state_show, NULL); |