projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
s390
/
cio
/
css.c
diff --git
a/drivers/s390/cio/css.c
b/drivers/s390/cio/css.c
index
4c81d89
..
fe0ace7
100644
(file)
--- a/
drivers/s390/cio/css.c
+++ b/
drivers/s390/cio/css.c
@@
-30,7
+30,7
@@
struct channel_subsystem *css[__MAX_CSSID + 1];
int css_characteristics_avail = 0;
int css_characteristics_avail = 0;
-in
line in
t
+int
for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *data)
{
struct subchannel_id schid;
for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *data)
{
struct subchannel_id schid;
@@
-108,9
+108,6
@@
css_subchannel_release(struct device *dev)
}
}
}
}
-extern int css_get_ssd_info(struct subchannel *sch);
-
-
int css_sch_device_register(struct subchannel *sch)
{
int ret;
int css_sch_device_register(struct subchannel *sch)
{
int ret;
@@
-139,6
+136,8
@@
css_register_subchannel(struct subchannel *sch)
sch->dev.release = &css_subchannel_release;
sch->dev.groups = subch_attr_groups;
sch->dev.release = &css_subchannel_release;
sch->dev.groups = subch_attr_groups;
+ css_get_ssd_info(sch);
+
/* make it known to the system */
ret = css_sch_device_register(sch);
if (ret) {
/* make it known to the system */
ret = css_sch_device_register(sch);
if (ret) {
@@
-146,7
+145,6
@@
css_register_subchannel(struct subchannel *sch)
__func__, sch->dev.bus_id);
return ret;
}
__func__, sch->dev.bus_id);
return ret;
}
- css_get_ssd_info(sch);
return ret;
}
return ret;
}
@@
-186,7
+184,7
@@
get_subchannel_by_schid(struct subchannel_id schid)
return dev ? to_subchannel(dev) : NULL;
}
return dev ? to_subchannel(dev) : NULL;
}
-static in
line in
t css_get_subchannel_status(struct subchannel *sch)
+static int css_get_subchannel_status(struct subchannel *sch)
{
struct schib schib;
{
struct schib schib;
@@
-298,7
+296,7
@@
static int css_evaluate_new_subchannel(struct subchannel_id schid, int slow)
/* Will be done on the slow path. */
return -EAGAIN;
}
/* Will be done on the slow path. */
return -EAGAIN;
}
- if (stsch(schid, &schib) || !schib.pmcw.dnv) {
+ if (stsch
_err
(schid, &schib) || !schib.pmcw.dnv) {
/* Unusable - ignore. */
return 0;
}
/* Unusable - ignore. */
return 0;
}
@@
-416,7
+414,7
@@
static void reprobe_all(struct work_struct *unused)
need_reprobe);
}
need_reprobe);
}
-DECLARE_WORK(css_reprobe_work, reprobe_all);
+
static
DECLARE_WORK(css_reprobe_work, reprobe_all);
/* Schedule reprobing of all unregistered subchannels. */
void css_schedule_reprobe(void)
/* Schedule reprobing of all unregistered subchannels. */
void css_schedule_reprobe(void)
@@
-577,7
+575,7
@@
css_cm_enable_store(struct device *dev, struct device_attribute *attr,
static DEVICE_ATTR(cm_enable, 0644, css_cm_enable_show, css_cm_enable_store);
static DEVICE_ATTR(cm_enable, 0644, css_cm_enable_show, css_cm_enable_store);
-static in
line in
t __init setup_css(int nr)
+static int __init setup_css(int nr)
{
u32 tod_high;
int ret;
{
u32 tod_high;
int ret;