[ARM] 5431/1: scoop: completely drop old-style SCOOP GPIO accessors

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Now, as all places that use Scoop GPIO have been converted to use
GPIO API, drop old-style accessors completely.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Dmitry Baryshkov and committed by

Russell King 17 years ago 17a92a78 8cb52f78

-33

2 changed files

expand all

arch

arm

common

scoop.c

include

asm

hardware

scoop.h

-31

arch/arm/common/scoop.c

··· 124 124 return 0; 125 125 } 126 126 127 - unsigned short set_scoop_gpio(struct device *dev, unsigned short bit) 128 - { 129 - unsigned short gpio_bit; 130 - unsigned long flag; 131 - struct scoop_dev *sdev = dev_get_drvdata(dev); 132 - 133 - spin_lock_irqsave(&sdev->scoop_lock, flag); 134 - gpio_bit = ioread16(sdev->base + SCOOP_GPWR) | bit; 135 - iowrite16(gpio_bit, sdev->base + SCOOP_GPWR); 136 - spin_unlock_irqrestore(&sdev->scoop_lock, flag); 137 - 138 - return gpio_bit; 139 - } 140 - 141 - unsigned short reset_scoop_gpio(struct device *dev, unsigned short bit) 142 - { 143 - unsigned short gpio_bit; 144 - unsigned long flag; 145 - struct scoop_dev *sdev = dev_get_drvdata(dev); 146 - 147 - spin_lock_irqsave(&sdev->scoop_lock, flag); 148 - gpio_bit = ioread16(sdev->base + SCOOP_GPWR) & ~bit; 149 - iowrite16(gpio_bit, sdev->base + SCOOP_GPWR); 150 - spin_unlock_irqrestore(&sdev->scoop_lock, flag); 151 - 152 - return gpio_bit; 153 - } 154 - 155 - EXPORT_SYMBOL(set_scoop_gpio); 156 - EXPORT_SYMBOL(reset_scoop_gpio); 157 - 158 127 unsigned short read_scoop_reg(struct device *dev, unsigned short reg) 159 128 { 160 129 struct scoop_dev *sdev = dev_get_drvdata(dev);

-2

arch/arm/include/asm/hardware/scoop.h

··· 63 63 extern struct scoop_pcmcia_config *platform_scoop_config; 64 64 65 65 void reset_scoop(struct device *dev); 66 - unsigned short __deprecated set_scoop_gpio(struct device *dev, unsigned short bit); 67 - unsigned short __deprecated reset_scoop_gpio(struct device *dev, unsigned short bit); 68 66 unsigned short read_scoop_reg(struct device *dev, unsigned short reg); 69 67 void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data);