From 1a4f7f4048bb91bc37aad61b3ba6aa1aacfc5708 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Sat, 13 Apr 2013 13:04:49 +0200
Subject: [PATCH] --- yaml --- r: 362789 b: refs/heads/master c:
 4e5ebd51214a1851841f952e9e5b5072ce5f9da4 h: refs/heads/master i:   362787:
 53e8ea304549264b538071ef20c53b58c8133505 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/s390/cio/css.c | 4 ++--
 trunk/drivers/s390/cio/css.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e7d2de825699..ec7a888f8c5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14556b33f2a5d6a3bc75cd33b709452a31555b25
+refs/heads/master: 4e5ebd51214a1851841f952e9e5b5072ce5f9da4
diff --git a/trunk/drivers/s390/cio/css.c b/trunk/drivers/s390/cio/css.c
index 3b2245f58bde..054fb428531f 100644
--- a/trunk/drivers/s390/cio/css.c
+++ b/trunk/drivers/s390/cio/css.c
@@ -304,10 +304,10 @@ int css_register_subchannel(struct subchannel *sch)
 	return ret;
 }
 
-int css_probe_device(struct subchannel_id schid)
+static int css_probe_device(struct subchannel_id schid)
 {
-	int ret;
 	struct subchannel *sch;
+	int ret;
 
 	sch = css_alloc_subchannel(schid);
 	if (IS_ERR(sch))
diff --git a/trunk/drivers/s390/cio/css.h b/trunk/drivers/s390/cio/css.h
index 2581b6986569..b1de60335238 100644
--- a/trunk/drivers/s390/cio/css.h
+++ b/trunk/drivers/s390/cio/css.h
@@ -101,7 +101,6 @@ extern int css_driver_register(struct css_driver *);
 extern void css_driver_unregister(struct css_driver *);
 
 extern void css_sch_device_unregister(struct subchannel *);
-extern int css_probe_device(struct subchannel_id);
 extern int css_register_subchannel(struct subchannel *);
 extern struct subchannel *css_alloc_subchannel(struct subchannel_id);
 extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);
@@ -111,7 +110,6 @@ int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),
 			       int (*fn_unknown)(struct subchannel_id,
 			       void *), void *data);
 extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *);
-extern void css_reiterate_subchannels(void);
 void css_update_ssd_info(struct subchannel *sch);
 
 struct channel_subsystem {