projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'origin'
[powerpc.git]
/
drivers
/
cdrom
/
viocd.c
diff --git
a/drivers/cdrom/viocd.c
b/drivers/cdrom/viocd.c
index
36f31d2
..
e276172
100644
(file)
--- a/
drivers/cdrom/viocd.c
+++ b/
drivers/cdrom/viocd.c
@@
-42,13
+42,11
@@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/bug.h>
-
#include <asm/vio.h>
#include <asm/scatterlist.h>
#include <asm/vio.h>
#include <asm/scatterlist.h>
-#include <asm/i
Series/HvT
ypes.h>
-#include <asm/i
Series/HvLpE
vent.h>
-#include <asm/i
S
eries/vio.h>
+#include <asm/i
series/hv_t
ypes.h>
+#include <asm/i
series/hv_lp_e
vent.h>
+#include <asm/i
s
eries/vio.h>
#define VIOCD_DEVICE "iseries/vcd"
#define VIOCD_DEVICE_DEVFS "iseries/vcd"
#define VIOCD_DEVICE "iseries/vcd"
#define VIOCD_DEVICE_DEVFS "iseries/vcd"
@@
-542,10
+540,10
@@
static void vio_handle_cd_event(struct HvLpEvent *event)
/* Notification that a partition went away! */
return;
/* First, we should NEVER get an int here...only acks */
/* Notification that a partition went away! */
return;
/* First, we should NEVER get an int here...only acks */
- if (
event->xFlags.xFunction == HvLpEvent_Function_Int
) {
+ if (
hvlpevent_is_int(event)
) {
printk(VIOCD_KERN_WARNING
"Yikes! got an int in viocd event handler!\n");
printk(VIOCD_KERN_WARNING
"Yikes! got an int in viocd event handler!\n");
- if (
event->xFlags.xAckInd == HvLpEvent_AckInd_DoAck
) {
+ if (
hvlpevent_need_ack(event)
) {
event->xRc = HvLpEvent_Rc_InvalidSubtype;
HvCallEvent_ackLpEvent(event);
}
event->xRc = HvLpEvent_Rc_InvalidSubtype;
HvCallEvent_ackLpEvent(event);
}
@@
-616,7
+614,7
@@
return_complete:
printk(VIOCD_KERN_WARNING
"message with invalid subtype %0x04X!\n",
event->xSubtype & VIOMINOR_SUBTYPE_MASK);
printk(VIOCD_KERN_WARNING
"message with invalid subtype %0x04X!\n",
event->xSubtype & VIOMINOR_SUBTYPE_MASK);
- if (
event->xFlags.xAckInd == HvLpEvent_AckInd_DoAck
) {
+ if (
hvlpevent_need_ack(event)
) {
event->xRc = HvLpEvent_Rc_InvalidSubtype;
HvCallEvent_ackLpEvent(event);
}
event->xRc = HvLpEvent_Rc_InvalidSubtype;
HvCallEvent_ackLpEvent(event);
}