From ed67074e2893bbbeeb96d78ec06facdbee13727e Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Wed, 2 Jun 2010 12:58:04 -0700 Subject: [PATCH] --- yaml --- r: 208210 b: refs/heads/master c: 1d1414419f034702bf587accdf2a9ac53245e000 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eb375f438878..0f40544791cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cf3af1c9ec26f8db3f386e48f9d979ad8bb3eff +refs/heads/master: 1d1414419f034702bf587accdf2a9ac53245e000 diff --git a/trunk/drivers/block/cciss.h b/trunk/drivers/block/cciss.h index c5d411174db0..c527932d223a 100644 --- a/trunk/drivers/block/cciss.h +++ b/trunk/drivers/block/cciss.h @@ -25,7 +25,7 @@ struct access_method { void (*submit_command)(ctlr_info_t *h, CommandList_struct *c); void (*set_intr_mask)(ctlr_info_t *h, unsigned long val); unsigned long (*fifo_full)(ctlr_info_t *h); - unsigned long (*intr_pending)(ctlr_info_t *h); + bool (*intr_pending)(ctlr_info_t *h); unsigned long (*command_completed)(ctlr_info_t *h); }; typedef struct _drive_info_struct @@ -253,7 +253,7 @@ static unsigned long SA5_completed(ctlr_info_t *h) /* * Returns true if an interrupt is pending.. */ -static unsigned long SA5_intr_pending(ctlr_info_t *h) +static bool SA5_intr_pending(ctlr_info_t *h) { unsigned long register_value = readl(h->vaddr + SA5_INTR_STATUS); @@ -268,7 +268,7 @@ static unsigned long SA5_intr_pending(ctlr_info_t *h) /* * Returns true if an interrupt is pending.. */ -static unsigned long SA5B_intr_pending(ctlr_info_t *h) +static bool SA5B_intr_pending(ctlr_info_t *h) { unsigned long register_value = readl(h->vaddr + SA5_INTR_STATUS);