diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kernel/ecard.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 85f4db6efa7c..bdbd7da99286 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) | |||
126 | 126 | ||
127 | res = ec->slot_no == 8 | 127 | res = ec->slot_no == 8 |
128 | ? &ec->resource[ECARD_RES_MEMC] | 128 | ? &ec->resource[ECARD_RES_MEMC] |
129 | : ec->type == ECARD_EASI | 129 | : ec->easi |
130 | ? &ec->resource[ECARD_RES_EASI] | 130 | ? &ec->resource[ECARD_RES_EASI] |
131 | : &ec->resource[ECARD_RES_IOCSYNC]; | 131 | : &ec->resource[ECARD_RES_IOCSYNC]; |
132 | 132 | ||
@@ -181,7 +181,7 @@ static void ecard_task_readbytes(struct ecard_request *req) | |||
181 | index += 1; | 181 | index += 1; |
182 | } | 182 | } |
183 | } else { | 183 | } else { |
184 | unsigned long base = (ec->type == ECARD_EASI | 184 | unsigned long base = (ec->easi |
185 | ? &ec->resource[ECARD_RES_EASI] | 185 | ? &ec->resource[ECARD_RES_EASI] |
186 | : &ec->resource[ECARD_RES_IOCSYNC])->start; | 186 | : &ec->resource[ECARD_RES_IOCSYNC])->start; |
187 | void __iomem *pbase = (void __iomem *)base; | 187 | void __iomem *pbase = (void __iomem *)base; |
@@ -728,7 +728,7 @@ static int ecard_prints(char *buffer, ecard_t *ec) | |||
728 | char *start = buffer; | 728 | char *start = buffer; |
729 | 729 | ||
730 | buffer += sprintf(buffer, " %d: %s ", ec->slot_no, | 730 | buffer += sprintf(buffer, " %d: %s ", ec->slot_no, |
731 | ec->type == ECARD_EASI ? "EASI" : " "); | 731 | ec->easi ? "EASI" : " "); |
732 | 732 | ||
733 | if (ec->cid.id == 0) { | 733 | if (ec->cid.id == 0) { |
734 | struct in_chunk_dir incd; | 734 | struct in_chunk_dir incd; |
@@ -815,7 +815,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot) | |||
815 | } | 815 | } |
816 | 816 | ||
817 | ec->slot_no = slot; | 817 | ec->slot_no = slot; |
818 | ec->type = type; | 818 | ec->easi = type == ECARD_EASI; |
819 | ec->irq = NO_IRQ; | 819 | ec->irq = NO_IRQ; |
820 | ec->fiq = NO_IRQ; | 820 | ec->fiq = NO_IRQ; |
821 | ec->dma = NO_DMA; | 821 | ec->dma = NO_DMA; |
@@ -909,7 +909,7 @@ static ssize_t ecard_show_device(struct device *dev, struct device_attribute *at | |||
909 | static ssize_t ecard_show_type(struct device *dev, struct device_attribute *attr, char *buf) | 909 | static ssize_t ecard_show_type(struct device *dev, struct device_attribute *attr, char *buf) |
910 | { | 910 | { |
911 | struct expansion_card *ec = ECARD_DEV(dev); | 911 | struct expansion_card *ec = ECARD_DEV(dev); |
912 | return sprintf(buf, "%s\n", ec->type == ECARD_EASI ? "EASI" : "IOC"); | 912 | return sprintf(buf, "%s\n", ec->easi ? "EASI" : "IOC"); |
913 | } | 913 | } |
914 | 914 | ||
915 | static struct device_attribute ecard_dev_attrs[] = { | 915 | static struct device_attribute ecard_dev_attrs[] = { |