From de9c48f22a27e7668a480f80dcb4a68f4a94d27d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 6 Oct 2017 11:42:07 +0200 Subject: [PATCH] drop pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch from 3.18 --- ...puts-in-mvebu_pinconf_group_dbg_show.patch | 50 ------------------- queue-3.18/series | 1 - 2 files changed, 51 deletions(-) delete mode 100644 queue-3.18/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch diff --git a/queue-3.18/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch b/queue-3.18/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch deleted file mode 100644 index 6cd65b9c5df..00000000000 --- a/queue-3.18/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch +++ /dev/null @@ -1,50 +0,0 @@ -From foo@baz Thu Oct 5 10:58:04 CEST 2017 -From: Markus Elfring -Date: Thu, 12 Jan 2017 16:51:00 +0100 -Subject: pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show() - -From: Markus Elfring - - -[ Upstream commit 420dc61642920849d824a0de2aa853db59f5244f ] - -Strings which did not contain data format specifications should be put -into a sequence. Thus use the corresponding function "seq_puts". - -This issue was detected by using the Coccinelle software. - -Signed-off-by: Markus Elfring -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c -+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c -@@ -195,11 +195,12 @@ static void mvebu_pinconf_group_dbg_show - seq_printf(s, "o"); - seq_printf(s, ")"); - } -- } else -- seq_printf(s, "current: UNKNOWN"); -+ } else { -+ seq_puts(s, "current: UNKNOWN"); -+ } - - if (grp->num_settings > 1) { -- seq_printf(s, ", available = ["); -+ seq_puts(s, ", available = ["); - for (n = 0; n < grp->num_settings; n++) { - if (curr == &grp->settings[n]) - continue; -@@ -222,7 +223,7 @@ static void mvebu_pinconf_group_dbg_show - seq_printf(s, ")"); - } - } -- seq_printf(s, " ]"); -+ seq_puts(s, " ]"); - } - return; - } diff --git a/queue-3.18/series b/queue-3.18/series index 31bff525c88..7e9f054a885 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -11,7 +11,6 @@ ib-ipoib-rtnl_unlock-can-not-come-after-free_netdev.patch ib-ipoib-replace-list_del-of-the-neigh-list-with-list_del_init.patch usb-serial-mos7720-fix-control-message-error-handling.patch usb-serial-mos7840-fix-control-message-error-handling.patch -pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch partitions-efi-fix-integer-overflow-in-gpt-size-calculation.patch audit-log-32-bit-socketcalls.patch net-core-prevent-from-dereferencing-null-pointer-when-releasing-skb.patch -- 2.47.3