projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[powerpc.git]
/
drivers
/
s390
/
cio
/
device_fsm.c
diff --git
a/drivers/s390/cio/device_fsm.c
b/drivers/s390/cio/device_fsm.c
index
eed1457
..
51238e7
100644
(file)
--- a/
drivers/s390/cio/device_fsm.c
+++ b/
drivers/s390/cio/device_fsm.c
@@
-206,7
+206,7
@@
ccw_device_handle_oper(struct ccw_device *cdev)
* been varied online on the SE so we have to find out by magic (i. e. driving
* the channel subsystem to device selection and updating our path masks).
*/
* been varied online on the SE so we have to find out by magic (i. e. driving
* the channel subsystem to device selection and updating our path masks).
*/
-static
inline
void
+static void
__recover_lost_chpids(struct subchannel *sch, int old_lpm)
{
int mask, i;
__recover_lost_chpids(struct subchannel *sch, int old_lpm)
{
int mask, i;
@@
-387,7
+387,7
@@
ccw_device_done(struct ccw_device *cdev, int state)
put_device (&cdev->dev);
}
put_device (&cdev->dev);
}
-static in
line in
t cmp_pgid(struct pgid *p1, struct pgid *p2)
+static int cmp_pgid(struct pgid *p1, struct pgid *p2)
{
char *c1;
char *c2;
{
char *c1;
char *c2;
@@
-842,6
+842,8
@@
ccw_device_irq(struct ccw_device *cdev, enum dev_event dev_event)
call_handler_unsol:
if (cdev->handler)
cdev->handler (cdev, 0, irb);
call_handler_unsol:
if (cdev->handler)
cdev->handler (cdev, 0, irb);
+ if (cdev->private->flags.doverify)
+ ccw_device_online_verify(cdev, 0);
return;
}
/* Accumulate status and find out if a basic sense is needed. */
return;
}
/* Accumulate status and find out if a basic sense is needed. */
@@
-892,7
+894,7
@@
ccw_device_online_timeout(struct ccw_device *cdev, enum dev_event dev_event)
/*
* Got an interrupt for a basic sense.
*/
/*
* Got an interrupt for a basic sense.
*/
-void
+
static
void
ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
{
struct irb *irb;
ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
{
struct irb *irb;