From 21ed531c8f5fccb45852c2fd6c5c60a42fe1d17b Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Wed, 7 Mar 2012 01:10:04 +0100
Subject: [PATCH] pci: remove pci_init1 API call

---
 drivers/ti1225/ti1225.c |  6 +-----
 include/minix/syslib.h  |  1 -
 lib/libddekit/src/pci.c |  2 +-
 lib/libsys/Makefile     |  1 -
 lib/libsys/pci_init.c   | 20 ++++++++++++++++--
 lib/libsys/pci_init1.c  | 46 -----------------------------------------
 6 files changed, 20 insertions(+), 56 deletions(-)
 delete mode 100644 lib/libsys/pci_init1.c

diff --git a/drivers/ti1225/ti1225.c b/drivers/ti1225/ti1225.c
index 358552723..5bcb7a126 100644
--- a/drivers/ti1225/ti1225.c
+++ b/drivers/ti1225/ti1225.c
@@ -48,7 +48,6 @@ PRIVATE struct pcitab pcitab_ti[]=
 
 	{ 0x0000, 0x0000, 0 }
 };
-PRIVATE char *progname;
 PRIVATE int debug;
 
 FORWARD _PROTOTYPE( void hw_init, (struct port *pp)			);
@@ -110,9 +109,6 @@ PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
 	int c, i, r, first, devind, port;
 	u16_t vid, did;
 
-	(progname=strrchr(env_argv[0],'/')) ? progname++
-		: (progname=env_argv[0]);
-
 	if((r=tsc_calibrate()) != OK)
 		panic("tsc_calibrate failed: %d", r);
 
@@ -127,7 +123,7 @@ PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
 		}
 	}
 
-	pci_init1(progname);
+	pci_init();
 
 	first= 1;
 	port= 0;
diff --git a/include/minix/syslib.h b/include/minix/syslib.h
index 568b17798..3919d0947 100644
--- a/include/minix/syslib.h
+++ b/include/minix/syslib.h
@@ -237,7 +237,6 @@ _PROTOTYPE(int sys_in, (int port, u32_t *value, int type)	);
 
 /* pci.c */
 _PROTOTYPE( void pci_init, (void)					);
-_PROTOTYPE( void pci_init1, (char *name)				);
 _PROTOTYPE( int pci_first_dev, (int *devindp, u16_t *vidp, u16_t *didp)	);
 _PROTOTYPE( int pci_next_dev, (int *devindp, u16_t *vidp, u16_t *didp)	);
 _PROTOTYPE( int pci_find_dev, (u8_t bus, u8_t dev, u8_t func,
diff --git a/lib/libddekit/src/pci.c b/lib/libddekit/src/pci.c
index 3768a4f20..7c5fcb085 100644
--- a/lib/libddekit/src/pci.c
+++ b/lib/libddekit/src/pci.c
@@ -55,7 +55,7 @@ PUBLIC void ddekit_pci_init_only_one(int skip)
 
 	DDEBUG_MSG_INFO("Initializing PCI subsystem...");
 
-	pci_init1("symbol clash");
+	pci_init();
 
 	/*
 	 * Iterate the PCI-bus
diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index ea12a1741..e959818e9 100644
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -38,7 +38,6 @@ SRCS=  \
 	pci_get_bar.c \
 	pci_ids.c \
 	pci_init.c \
-	pci_init1.c \
 	pci_next_dev.c \
 	pci_rescan_bus.c \
 	pci_reserve.c \
diff --git a/lib/libsys/pci_init.c b/lib/libsys/pci_init.c
index 068df00ad..d7f79915f 100644
--- a/lib/libsys/pci_init.c
+++ b/lib/libsys/pci_init.c
@@ -3,12 +3,28 @@ pci_init.c
 */
 
 #include "syslib.h"
+#include <minix/ds.h>
+#include <minix/sysutil.h>
+
+endpoint_t pci_procnr= ANY;
 
 /*===========================================================================*
  *				pci_init				     *
  *===========================================================================*/
-PUBLIC void pci_init()
+PUBLIC void pci_init(void)
 {
-	pci_init1("");
+	int r;
+	message m;
+
+	r= ds_retrieve_label_endpt("pci", &pci_procnr);
+	if (r != 0)
+		panic("pci_init: unable to obtain label for 'pci': %d", r);
+
+	m.m_type= BUSC_PCI_INIT;
+	r= sendrec(pci_procnr, &m);
+	if (r != 0)
+		panic("pci_init: can't talk to PCI: %d", r);
+	if (m.m_type != 0)
+		panic("pci_init: got bad reply from PCI: %d", m.m_type);
 }
 
diff --git a/lib/libsys/pci_init1.c b/lib/libsys/pci_init1.c
deleted file mode 100644
index 2838a8eea..000000000
--- a/lib/libsys/pci_init1.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-pci_init1.c
-*/
-
-#include "pci.h"
-#include "syslib.h"
-#include <string.h>
-#include <unistd.h>
-#include <minix/ds.h>
-#include <minix/sysutil.h>
-
-int pci_procnr= ANY;
-
-/*===========================================================================*
- *				pci_init1				     *
- *===========================================================================*/
-PUBLIC void pci_init1(name)
-char *name;
-{
-	int r;
-	endpoint_t endpoint;
-	size_t len;
-	message m;
-
-	r= ds_retrieve_label_endpt("pci", &endpoint);
-	if (r != 0)
-		panic("pci_init1: ds_retrieve_label_endpt failed for 'pci': %d", r);
-	pci_procnr= endpoint;
-
-	m.m_type= BUSC_PCI_INIT;
-	len= strlen(name);
-	if (len+1 <= sizeof(m.m3_ca1))
-		strcpy(m.m3_ca1, name);
-	else
-	{
-		len= sizeof(m.m3_ca1)-1;
-		memcpy(m.m3_ca1, name, len);
-		m.m3_ca1[len]= '\0';
-	}
-	r= sendrec(pci_procnr, &m);
-	if (r != 0)
-		panic("pci_init1: can't talk to PCI: %d", r);
-	if (m.m_type != 0)
-		panic("pci_init1: got bad reply from PCI: %d", m.m_type);
-}
-