This is a note to let you know that I've just added the patch titled
drivers core: Reindent a couple uses around sysfs_emit
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drivers-core-reindent-a-couple-uses-around-sysfs_emi.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 8af05fe961081463b9e1511e25a9b2074925f9b3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Sep 16 13:40:41 2020 -0700
drivers core: Reindent a couple uses around sysfs_emit
[ Upstream commit 27275d301813d1f3b1b2fe5576d4afd690df6b99 ]
Just a couple of whitespace realignment to open parenthesis for
multi-line statements.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/33224191421dbb56015eded428edfddcba997d63.1600285923.git.joe@xxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Stable-dep-of: 55c421b36448 ("mmc: davinci: Don't strip remove function when driver is builtin")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 666eb55c0774e..c78d190fef376 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -384,9 +384,9 @@ static ssize_t node_read_meminfo(struct device *dev,
nid, K(i.freeram),
nid, K(i.totalram - i.freeram),
nid, K(node_page_state(pgdat, NR_ACTIVE_ANON) +
- node_page_state(pgdat, NR_ACTIVE_FILE)),
+ node_page_state(pgdat, NR_ACTIVE_FILE)),
nid, K(node_page_state(pgdat, NR_INACTIVE_ANON) +
- node_page_state(pgdat, NR_INACTIVE_FILE)),
+ node_page_state(pgdat, NR_INACTIVE_FILE)),
nid, K(node_page_state(pgdat, NR_ACTIVE_ANON)),
nid, K(node_page_state(pgdat, NR_INACTIVE_ANON)),
nid, K(node_page_state(pgdat, NR_ACTIVE_FILE)),
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 2786962e08107..4ac032a1fa228 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -101,7 +101,7 @@ static ssize_t control_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return sysfs_emit(buf, "%s\n",
- dev->power.runtime_auto ? ctrl_auto : ctrl_on);
+ dev->power.runtime_auto ? ctrl_auto : ctrl_on);
}
static ssize_t control_store(struct device * dev, struct device_attribute *attr,
