diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-11-01 17:11:16 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-11-01 17:11:16 +0000 |
| commit | 647541a1a0f6e333f1ccad1a49eeb62937edfef8 (patch) | |
| tree | ccb955358a88cb96f81b22d7af00a952dc87595f /target/linux/adm5120/files/drivers/block/rb1xx/ata.c | |
| parent | 772c6488da203a2d3af523cc3b4a2378a2a1ae12 (diff) | |
| download | master-31e0f0ae-647541a1a0f6e333f1ccad1a49eeb62937edfef8.tar.gz master-31e0f0ae-647541a1a0f6e333f1ccad1a49eeb62937edfef8.tar.bz2 master-31e0f0ae-647541a1a0f6e333f1ccad1a49eeb62937edfef8.zip | |
CF driver cleanup
SVN-Revision: 9473
Diffstat (limited to 'target/linux/adm5120/files/drivers/block/rb1xx/ata.c')
| -rw-r--r-- | target/linux/adm5120/files/drivers/block/rb1xx/ata.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/adm5120/files/drivers/block/rb1xx/ata.c b/target/linux/adm5120/files/drivers/block/rb1xx/ata.c index b396317f5f..5447be5219 100644 --- a/target/linux/adm5120/files/drivers/block/rb1xx/ata.c +++ b/target/linux/adm5120/files/drivers/block/rb1xx/ata.c @@ -16,8 +16,9 @@ #include <linux/pci.h> #include <linux/ioport.h> /* request_mem_region() */ -#include <asm/unaligned.h> /* ioremap() */ -#include <asm/io.h> /* ioremap() */ +#include <asm/unaligned.h> +#include <asm/io.h> +#include <asm/gpio.h> #include <gpio.h> #include <adm5120_defs.h> @@ -69,7 +70,7 @@ static inline u8 rareg(unsigned reg, struct cf_mips_dev* dev) static inline int cfrdy(struct cf_mips_dev *dev) { - return (SW_READ_REG(GPIO_CONF0) & (1 << 12)); + return gpio_get_value(12); } static inline void prepare_cf_irq(struct cf_mips_dev *dev) @@ -92,7 +93,7 @@ static inline int cf_present(struct cf_mips_dev* dev) int i; /* on RB100 WAIT is LOW all the time => read will hang */ - if (SW_READ_REG(GPIO_CONF0) & (1 << 8)) + if (gpio_read_value(8)) cmd |= EXTIO_WAIT_EN; SW_WRITE_REG(GPIO_CONF2, cmd); |