From 6014d07cb1067fbb0fbdacc68e094746a3040185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B6ppner?= <hoeppner@linux.ibm.com>
Date: Wed, 3 Apr 2019 16:03:45 +0200
Subject: [PATCH] dasdview/libdasd/zipl: Use util_sys_get_dev_addr() instead of
 u2s_getbusid()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use the newer and more robust libutil provided function
util_sys_get_dev_addr() to identify a device address for any former user
of u2s_getbusid().

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 dasdview/dasdview.c | 3 ++-
 libdasd/dasd_sys.c  | 5 +++--
 zipl/src/Makefile   | 3 +--
 zipl/src/install.c  | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dasdview/dasdview.c b/dasdview/dasdview.c
index d27f3f67..61bed640 100644
--- a/dasdview/dasdview.c
+++ b/dasdview/dasdview.c
@@ -32,6 +32,7 @@
 #include "lib/util_base.h"
 #include "lib/util_opt.h"
 #include "lib/util_prg.h"
+#include "lib/util_sys.h"
 #include "lib/vtoc.h"
 #include "lib/zt_common.h"
 
@@ -183,7 +184,7 @@ dasdview_get_info(dasdview_info_t *info)
 	else
 		info->hw_cylinders = characteristics->no_cyl;
 
-	if (u2s_getbusid(info->device, info->busid) == -1)
+	if (util_sys_get_dev_addr(info->device, info->busid) != 0)
 		info->busid_valid = 0;
 	else
 		info->busid_valid = 1;
diff --git a/libdasd/dasd_sys.c b/libdasd/dasd_sys.c
index ac6ea7b6..5ca46945 100644
--- a/libdasd/dasd_sys.c
+++ b/libdasd/dasd_sys.c
@@ -15,6 +15,7 @@
 #include "lib/dasd_base.h"
 #include "lib/dasd_sys.h"
 #include "lib/util_path.h"
+#include "lib/util_sys.h"
 
 /**
  * Get raw-track access mode status
@@ -38,7 +39,7 @@ int dasd_sys_raw_track_access(char *devnode)
 	FILE *fp;
 	int rc;
 
-	if (u2s_getbusid(devnode, busid))
+	if (util_sys_get_dev_addr(devnode, busid) != 0)
 		return 0;
 
 	path = util_path_sysfs("bus/ccw/devices/%s/raw_track_access", busid);
@@ -115,7 +116,7 @@ int dasd_reset_chpid(char *devnode, char *chpid_char)
 	char *path;
 	FILE *fp;
 
-	if (u2s_getbusid(devnode, busid))
+	if (util_sys_get_dev_addr(devnode, busid) != 0)
 		return ENODEV;
 
 	if (!chpid_char) {
diff --git a/zipl/src/Makefile b/zipl/src/Makefile
index eae081bc..191c7db8 100644
--- a/zipl/src/Makefile
+++ b/zipl/src/Makefile
@@ -7,8 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
 ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
 
-libs =	$(rootdir)/libu2s/libu2s.a \
-	$(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libutil/libutil.a
 
 objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
 	  install.o zipl.o $(rootdir)/zipl/boot/data.o
diff --git a/zipl/src/install.c b/zipl/src/install.c
index a6c43334..20b53f54 100644
--- a/zipl/src/install.c
+++ b/zipl/src/install.c
@@ -23,7 +23,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "lib/u2s.h"
+#include "lib/util_sys.h"
 
 #include "boot.h"
 #include "bootmap.h"
@@ -1132,7 +1132,7 @@ install_mvdump(char* const device[], struct job_target_data* target, int count,
 		parm.param[i].num_heads = info[i]->geo.heads;
 		parm.param[i].blocksize = info[i]->phy_block_size >> 8;
 		parm.param[i].devno = info[i]->devno;
-		if (u2s_getbusid(device[i], busid)) {
+		if (util_sys_get_dev_addr(device[i], busid) != 0) {
 			error_text("Could not find bus-ID for '%s'", device[i]);
 			rc = -1;
 			goto out;