Skip to content

Commit b57587f

Browse files
MrVanBartosz Golaszewski
authored andcommitted
gpio: vf610: simplify code by dropping data check
All of_device_id entries has valid data, so code simplified a bit by dropping the data check. Signed-off-by: Peng Fan <[email protected]> Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent 76bc907 commit b57587f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpio/gpio-vf610.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static int vf610_gpio_get(struct gpio_chip *gc, unsigned int gpio)
100100
unsigned long mask = BIT(gpio);
101101
unsigned long offset = GPIO_PDIR;
102102

103-
if (port->sdata && port->sdata->have_paddr) {
103+
if (port->sdata->have_paddr) {
104104
mask &= vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
105105
if (mask)
106106
offset = GPIO_PDOR;
@@ -124,7 +124,7 @@ static int vf610_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
124124
unsigned long mask = BIT(gpio);
125125
u32 val;
126126

127-
if (port->sdata && port->sdata->have_paddr) {
127+
if (port->sdata->have_paddr) {
128128
val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
129129
val &= ~mask;
130130
vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
@@ -140,7 +140,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
140140
unsigned long mask = BIT(gpio);
141141
u32 val;
142142

143-
if (port->sdata && port->sdata->have_paddr) {
143+
if (port->sdata->have_paddr) {
144144
val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
145145
val |= mask;
146146
vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);

0 commit comments

Comments
 (0)