]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Apr 2017 09:37:51 +0000 (11:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Apr 2017 09:37:51 +0000 (11:37 +0200)
added patches:
mmc-dw_mmc-silent-verbose-log-when-calling-from-pm-context.patch

queue-4.10/mmc-dw_mmc-silent-verbose-log-when-calling-from-pm-context.patch [new file with mode: 0644]
queue-4.10/series

diff --git a/queue-4.10/mmc-dw_mmc-silent-verbose-log-when-calling-from-pm-context.patch b/queue-4.10/mmc-dw_mmc-silent-verbose-log-when-calling-from-pm-context.patch
new file mode 100644 (file)
index 0000000..39355b6
--- /dev/null
@@ -0,0 +1,46 @@
+From ce69e2fea093b7fa3991c87849c4955cd47796c9 Mon Sep 17 00:00:00 2001
+From: Shawn Lin <shawn.lin@rock-chips.com>
+Date: Tue, 17 Jan 2017 09:22:55 +0800
+Subject: mmc: dw_mmc: silent verbose log when calling from PM context
+
+From: Shawn Lin <shawn.lin@rock-chips.com>
+
+commit ce69e2fea093b7fa3991c87849c4955cd47796c9 upstream.
+
+When deploying runtime PM, it's quite verbose to print the
+log of ios setting. Also it's useless to print it from system
+PM as it should be the same with booting time. We also have
+sysfs to get all these information from ios attribute, so let's
+skip this print from PM context.
+
+Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
+Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Cc: Alexander Kochetkov <al.kochet@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mmc/host/dw_mmc.c |   12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+--- a/drivers/mmc/host/dw_mmc.c
++++ b/drivers/mmc/host/dw_mmc.c
+@@ -1179,11 +1179,13 @@ static void dw_mci_setup_bus(struct dw_m
+               if ((clock != slot->__clk_old &&
+                       !test_bit(DW_MMC_CARD_NEEDS_POLL, &slot->flags)) ||
+                       force_clkinit) {
+-                      dev_info(&slot->mmc->class_dev,
+-                               "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
+-                               slot->id, host->bus_hz, clock,
+-                               div ? ((host->bus_hz / div) >> 1) :
+-                               host->bus_hz, div);
++                      /* Silent the verbose log if calling from PM context */
++                      if (!force_clkinit)
++                              dev_info(&slot->mmc->class_dev,
++                                       "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
++                                       slot->id, host->bus_hz, clock,
++                                       div ? ((host->bus_hz / div) >> 1) :
++                                       host->bus_hz, div);
+                       /*
+                        * If card is polling, display the message only
index 17452cf769cfdc46f643d4e76994a58b6ee37199..34d90324940a1823c36fc2637e454bdf4b93141a 100644 (file)
@@ -7,3 +7,4 @@ ring-buffer-have-ring_buffer_iter_empty-return-true-when-empty.patch
 mm-prevent-nr_isolate_-stats-from-going-negative.patch
 cifs-do-not-send-echoes-before-negotiate-is-complete.patch
 cifs-remove-bad_network_name-flag.patch
+mmc-dw_mmc-silent-verbose-log-when-calling-from-pm-context.patch