|
 |
5e6fc3 |
From 0c44e3d75a9c3a2a1d4cef3c1b836aa0d7fb004f Mon Sep 17 00:00:00 2001
|
|
|
5e6fc3 |
From: Peter Jones <pjones@redhat.com>
|
|
|
5e6fc3 |
Date: Fri, 3 Aug 2018 10:02:02 -0400
|
|
|
5e6fc3 |
Subject: [PATCH 30/39] linux-emmc: update for internal API breakage.
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
Alek wrote his code before I made debug() imply LOG_DEBUG, so we need to
|
|
|
5e6fc3 |
change that here as well.
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
5e6fc3 |
---
|
|
|
5e6fc3 |
src/linux-emmc.c | 12 ++++++------
|
|
|
5e6fc3 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
diff --git a/src/linux-emmc.c b/src/linux-emmc.c
|
|
|
5e6fc3 |
index f0c9e635cb6..87e92477554 100644
|
|
|
5e6fc3 |
--- a/src/linux-emmc.c
|
|
|
5e6fc3 |
+++ b/src/linux-emmc.c
|
|
|
5e6fc3 |
@@ -58,15 +58,15 @@ parse_emmc(struct device *dev, const char *current, const char *root UNUSED)
|
|
|
5e6fc3 |
spaces[pos0] = '\0';
|
|
|
5e6fc3 |
pos0 = 0;
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
- debug(DEBUG, "entry");
|
|
|
5e6fc3 |
+ debug("entry");
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
- debug(DEBUG, "searching for mmc_host/mmc0/mmc0:0001/block/mmcblk0 or mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p1");
|
|
|
5e6fc3 |
+ debug("searching for mmc_host/mmc0/mmc0:0001/block/mmcblk0 or mmc_host/mmc0/mmc0:0001/block/mmcblk0/mmcblk0p1");
|
|
|
5e6fc3 |
rc = sscanf(current, "mmc_host/mmc%d/mmc%d:%d/block/mmcblk%d%n/mmcblk%dp%d%n",
|
|
|
5e6fc3 |
&tosser0, &tosser1, &tosser2, &slot_id,
|
|
|
5e6fc3 |
&pos0, &tosser3, &partition, &pos1);
|
|
|
5e6fc3 |
- debug(DEBUG, "current:\"%s\" rc:%d pos0:%d pos1:%d\n", current, rc, pos0, pos1);
|
|
|
5e6fc3 |
- arrow(DEBUG, spaces, 9, pos0, rc, 4);
|
|
|
5e6fc3 |
- arrow(DEBUG, spaces, 9, pos1, rc, 6);
|
|
|
5e6fc3 |
+ debug("current:\"%s\" rc:%d pos0:%d pos1:%d\n", current, rc, pos0, pos1);
|
|
|
5e6fc3 |
+ arrow(LOG_DEBUG, spaces, 9, pos0, rc, 4);
|
|
|
5e6fc3 |
+ arrow(LOG_DEBUG, spaces, 9, pos1, rc, 6);
|
|
|
5e6fc3 |
/*
|
|
|
5e6fc3 |
* If it isn't of that form, it's not one of our emmc devices.
|
|
|
5e6fc3 |
*/
|
|
|
5e6fc3 |
@@ -92,7 +92,7 @@ dp_create_emmc(struct device *dev,
|
|
|
5e6fc3 |
{
|
|
|
5e6fc3 |
ssize_t sz;
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
- debug(DEBUG, "entry");
|
|
|
5e6fc3 |
+ debug("entry");
|
|
|
5e6fc3 |
|
|
|
5e6fc3 |
sz = efidp_make_emmc(buf + off, size ? size - off : 0,
|
|
|
5e6fc3 |
dev->emmc_info.slot_id);
|
|
|
5e6fc3 |
--
|
|
|
5e6fc3 |
2.17.1
|
|
|
5e6fc3 |
|