Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5559bca8e66f968192a5416d953c88cc3389cb22
Commit: 5559bca8e66f968192a5416d953c88cc3389cb22
Parent: c0b04d1b2c427629b2dbe066422a507ad855bf61
Author: Russell King <[EMAIL PROTECTED]>
AuthorDate: Thu May 3 10:47:37 2007 +0100
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Thu May 3 14:16:56 2007 +0100
[ARM] ecard: Convert card type enum to a flag
'type' in the struct expansion_card is only used to indicate
whether this card is an EASI card or not. Therefore, having
it as an enum is wasteful (and introduces additional noise
when we come to remove the enum.) Convert it to a mere flag
instead.
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
arch/arm/kernel/ecard.c | 10 +++++-----
include/asm-arm/ecard.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 85f4db6..bdbd7da 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -126,7 +126,7 @@ static void ecard_task_reset(struct ecard_request *req)
res = ec->slot_no == 8
? &ec->resource[ECARD_RES_MEMC]
- : ec->type == ECARD_EASI
+ : ec->easi
? &ec->resource[ECARD_RES_EASI]
: &ec->resource[ECARD_RES_IOCSYNC];
@@ -181,7 +181,7 @@ static void ecard_task_readbytes(struct ecard_request *req)
index += 1;
}
} else {
- unsigned long base = (ec->type == ECARD_EASI
+ unsigned long base = (ec->easi
? &ec->resource[ECARD_RES_EASI]
: &ec->resource[ECARD_RES_IOCSYNC])->start;
void __iomem *pbase = (void __iomem *)base;
@@ -728,7 +728,7 @@ static int ecard_prints(char *buffer, ecard_t *ec)
char *start = buffer;
buffer += sprintf(buffer, " %d: %s ", ec->slot_no,
- ec->type == ECARD_EASI ? "EASI" : " ");
+ ec->easi ? "EASI" : " ");
if (ec->cid.id == 0) {
struct in_chunk_dir incd;
@@ -815,7 +815,7 @@ static struct expansion_card *__init ecard_alloc_card(int
type, int slot)
}
ec->slot_no = slot;
- ec->type = type;
+ ec->easi = type == ECARD_EASI;
ec->irq = NO_IRQ;
ec->fiq = NO_IRQ;
ec->dma = NO_DMA;
@@ -909,7 +909,7 @@ static ssize_t ecard_show_device(struct device *dev, struct
device_attribute *at
static ssize_t ecard_show_type(struct device *dev, struct device_attribute
*attr, char *buf)
{
struct expansion_card *ec = ECARD_DEV(dev);
- return sprintf(buf, "%s\n", ec->type == ECARD_EASI ? "EASI" : "IOC");
+ return sprintf(buf, "%s\n", ec->easi ? "EASI" : "IOC");
}
static struct device_attribute ecard_dev_attrs[] = {
diff --git a/include/asm-arm/ecard.h b/include/asm-arm/ecard.h
index bd4b576..3a6d3eb 100644
--- a/include/asm-arm/ecard.h
+++ b/include/asm-arm/ecard.h
@@ -160,6 +160,7 @@ struct expansion_card {
unsigned char irqmask; /* IRQ mask
*/
unsigned char fiqmask; /* FIQ mask
*/
unsigned char claimed; /* Card claimed?
*/
+ unsigned char easi; /* EASI card
*/
void *irq_data; /* Data for use for IRQ by card
*/
void *fiq_data; /* Data for use for FIQ by card
*/
@@ -169,7 +170,6 @@ struct expansion_card {
CONST unsigned int dma; /* DMA number (for request_dma)
*/
CONST unsigned int irq; /* IRQ number (for request_irq)
*/
CONST unsigned int fiq; /* FIQ number (for request_irq)
*/
- CONST card_type_t type; /* Type of card
*/
CONST struct in_ecid cid; /* Card Identification
*/
/* Private internal data */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
