gpio: pca953x_gpio: Fix style violations

Fix some style violations in the pca953x_gpio driver.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
This commit is contained in:
Mario Six 2018-01-15 11:07:44 +01:00 committed by Tom Rini
parent 2d06fd839d
commit fb01e07a95

View File

@ -123,7 +123,8 @@ static int pca953x_read_regs(struct udevice *dev, int reg, u8 *val)
ret = dm_i2c_read(dev, reg << 1, val, info->bank_count); ret = dm_i2c_read(dev, reg << 1, val, info->bank_count);
} else if (info->gpio_count == 40) { } else if (info->gpio_count == 40) {
/* Auto increment */ /* Auto increment */
ret = dm_i2c_read(dev, (reg << 3) | 0x80, val, info->bank_count); ret = dm_i2c_read(dev, (reg << 3) | 0x80, val,
info->bank_count);
} else { } else {
dev_err(dev, "Unsupported now\n"); dev_err(dev, "Unsupported now\n");
return -EINVAL; return -EINVAL;
@ -143,7 +144,7 @@ static int pca953x_is_output(struct udevice *dev, int offset)
return !(info->reg_direction[bank] & (1 << off)); return !(info->reg_direction[bank] & (1 << off));
} }
static int pca953x_get_value(struct udevice *dev, unsigned offset) static int pca953x_get_value(struct udevice *dev, uint offset)
{ {
int ret; int ret;
u8 val = 0; u8 val = 0;
@ -157,8 +158,7 @@ static int pca953x_get_value(struct udevice *dev, unsigned offset)
return (val >> off) & 0x1; return (val >> off) & 0x1;
} }
static int pca953x_set_value(struct udevice *dev, unsigned offset, static int pca953x_set_value(struct udevice *dev, uint offset, int value)
int value)
{ {
struct pca953x_info *info = dev_get_platdata(dev); struct pca953x_info *info = dev_get_platdata(dev);
int bank = offset / BANK_SZ; int bank = offset / BANK_SZ;
@ -180,7 +180,7 @@ static int pca953x_set_value(struct udevice *dev, unsigned offset,
return 0; return 0;
} }
static int pca953x_set_direction(struct udevice *dev, unsigned offset, int dir) static int pca953x_set_direction(struct udevice *dev, uint offset, int dir)
{ {
struct pca953x_info *info = dev_get_platdata(dev); struct pca953x_info *info = dev_get_platdata(dev);
int bank = offset / BANK_SZ; int bank = offset / BANK_SZ;
@ -202,13 +202,12 @@ static int pca953x_set_direction(struct udevice *dev, unsigned offset, int dir)
return 0; return 0;
} }
static int pca953x_direction_input(struct udevice *dev, unsigned offset) static int pca953x_direction_input(struct udevice *dev, uint offset)
{ {
return pca953x_set_direction(dev, offset, PCA953X_DIRECTION_IN); return pca953x_set_direction(dev, offset, PCA953X_DIRECTION_IN);
} }
static int pca953x_direction_output(struct udevice *dev, unsigned offset, static int pca953x_direction_output(struct udevice *dev, uint offset, int value)
int value)
{ {
/* Configure output value. */ /* Configure output value. */
pca953x_set_value(dev, offset, value); pca953x_set_value(dev, offset, value);
@ -219,7 +218,7 @@ static int pca953x_direction_output(struct udevice *dev, unsigned offset,
return 0; return 0;
} }
static int pca953x_get_function(struct udevice *dev, unsigned offset) static int pca953x_get_function(struct udevice *dev, uint offset)
{ {
if (pca953x_is_output(dev, offset)) if (pca953x_is_output(dev, offset))
return GPIOF_OUTPUT; return GPIOF_OUTPUT;
@ -231,7 +230,7 @@ static int pca953x_xlate(struct udevice *dev, struct gpio_desc *desc,
struct ofnode_phandle_args *args) struct ofnode_phandle_args *args)
{ {
desc->offset = args->args[0]; desc->offset = args->args[0];
desc->flags = args->args[1] & GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0; desc->flags = args->args[1] & (GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0);
return 0; return 0;
} }