forked from Minki/linux
[ARM] 5431/1: scoop: completely drop old-style SCOOP GPIO accessors
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>
This commit is contained in:
parent
8cb52f788c
commit
17a92a788e
@ -124,37 +124,6 @@ static int scoop_gpio_direction_output(struct gpio_chip *chip,
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned short set_scoop_gpio(struct device *dev, unsigned short bit)
|
||||
{
|
||||
unsigned short gpio_bit;
|
||||
unsigned long flag;
|
||||
struct scoop_dev *sdev = dev_get_drvdata(dev);
|
||||
|
||||
spin_lock_irqsave(&sdev->scoop_lock, flag);
|
||||
gpio_bit = ioread16(sdev->base + SCOOP_GPWR) | bit;
|
||||
iowrite16(gpio_bit, sdev->base + SCOOP_GPWR);
|
||||
spin_unlock_irqrestore(&sdev->scoop_lock, flag);
|
||||
|
||||
return gpio_bit;
|
||||
}
|
||||
|
||||
unsigned short reset_scoop_gpio(struct device *dev, unsigned short bit)
|
||||
{
|
||||
unsigned short gpio_bit;
|
||||
unsigned long flag;
|
||||
struct scoop_dev *sdev = dev_get_drvdata(dev);
|
||||
|
||||
spin_lock_irqsave(&sdev->scoop_lock, flag);
|
||||
gpio_bit = ioread16(sdev->base + SCOOP_GPWR) & ~bit;
|
||||
iowrite16(gpio_bit, sdev->base + SCOOP_GPWR);
|
||||
spin_unlock_irqrestore(&sdev->scoop_lock, flag);
|
||||
|
||||
return gpio_bit;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(set_scoop_gpio);
|
||||
EXPORT_SYMBOL(reset_scoop_gpio);
|
||||
|
||||
unsigned short read_scoop_reg(struct device *dev, unsigned short reg)
|
||||
{
|
||||
struct scoop_dev *sdev = dev_get_drvdata(dev);
|
||||
|
@ -63,7 +63,5 @@ struct scoop_pcmcia_config {
|
||||
extern struct scoop_pcmcia_config *platform_scoop_config;
|
||||
|
||||
void reset_scoop(struct device *dev);
|
||||
unsigned short __deprecated set_scoop_gpio(struct device *dev, unsigned short bit);
|
||||
unsigned short __deprecated reset_scoop_gpio(struct device *dev, unsigned short bit);
|
||||
unsigned short read_scoop_reg(struct device *dev, unsigned short reg);
|
||||
void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data);
|
||||
|
Loading…
Reference in New Issue
Block a user