diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-01-11 21:47:43 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 04:09:29 -0500 |
commit | 677f8c0d0455a35aaff08a0292ba9c6232ef4eb1 (patch) | |
tree | ebac30f3413ecc2eeb2b1f8788b379ac6b56a237 /drivers/cdrom/viocd.c | |
parent | 6814350b80e0e7dfb87d2faebbcbef876573897c (diff) |
[PATCH] powerpc: remove bitfields from HvLpEvent
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/cdrom/viocd.c')
-rw-r--r-- | drivers/cdrom/viocd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index b5191780ecca..193446e6a08a 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c | |||
@@ -542,10 +542,10 @@ static void vio_handle_cd_event(struct HvLpEvent *event) | |||
542 | /* Notification that a partition went away! */ | 542 | /* Notification that a partition went away! */ |
543 | return; | 543 | return; |
544 | /* First, we should NEVER get an int here...only acks */ | 544 | /* First, we should NEVER get an int here...only acks */ |
545 | if (event->xFlags.xFunction == HvLpEvent_Function_Int) { | 545 | if (hvlpevent_is_int(event)) { |
546 | printk(VIOCD_KERN_WARNING | 546 | printk(VIOCD_KERN_WARNING |
547 | "Yikes! got an int in viocd event handler!\n"); | 547 | "Yikes! got an int in viocd event handler!\n"); |
548 | if (event->xFlags.xAckInd == HvLpEvent_AckInd_DoAck) { | 548 | if (hvlpevent_need_ack(event)) { |
549 | event->xRc = HvLpEvent_Rc_InvalidSubtype; | 549 | event->xRc = HvLpEvent_Rc_InvalidSubtype; |
550 | HvCallEvent_ackLpEvent(event); | 550 | HvCallEvent_ackLpEvent(event); |
551 | } | 551 | } |
@@ -616,7 +616,7 @@ return_complete: | |||
616 | printk(VIOCD_KERN_WARNING | 616 | printk(VIOCD_KERN_WARNING |
617 | "message with invalid subtype %0x04X!\n", | 617 | "message with invalid subtype %0x04X!\n", |
618 | event->xSubtype & VIOMINOR_SUBTYPE_MASK); | 618 | event->xSubtype & VIOMINOR_SUBTYPE_MASK); |
619 | if (event->xFlags.xAckInd == HvLpEvent_AckInd_DoAck) { | 619 | if (hvlpevent_need_ack(event)) { |
620 | event->xRc = HvLpEvent_Rc_InvalidSubtype; | 620 | event->xRc = HvLpEvent_Rc_InvalidSubtype; |
621 | HvCallEvent_ackLpEvent(event); | 621 | HvCallEvent_ackLpEvent(event); |
622 | } | 622 | } |