Skip to content

Commit

Permalink
Merge tag 'gpio-fixes-for-v5.16-rc2' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…linux/kernel/git/brgl/linux

Pull gpio fixes from Bartosz Golaszewski:

 - fix a coccicheck warning in gpio-virtio

 - fix gpio selftests build issues

 - fix a Kconfig issue in gpio-rockchip

* tag 'gpio-fixes-for-v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: rockchip: needs GENERIC_IRQ_CHIP to fix build errors
  selftests: gpio: restore CFLAGS options
  selftests: gpio: fix uninitialised variable warning
  selftests: gpio: fix gpio compiling error
  gpio: virtio: remove unneeded semicolon
  • Loading branch information
torvalds committed Nov 19, 2021
2 parents ad44518 + d6912b1 commit 4479169
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions drivers/gpio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ config GPIO_REG
config GPIO_ROCKCHIP
tristate "Rockchip GPIO support"
depends on ARCH_ROCKCHIP || COMPILE_TEST
select GENERIC_IRQ_CHIP
select GPIOLIB_IRQCHIP
default ARCH_ROCKCHIP
help
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-virtio.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ static void virtio_gpio_event_vq(struct virtqueue *vq)
ret = generic_handle_domain_irq(vgpio->gc.irq.domain, gpio);
if (ret)
dev_err(dev, "failed to handle interrupt: %d\n", ret);
};
}
}

static void virtio_gpio_request_vq(struct virtqueue *vq)
Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/gpio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
TEST_PROGS := gpio-mockup.sh
TEST_FILES := gpio-mockup-sysfs.sh
TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev
CFLAGS += -O2 -g -Wall -I../../../../usr/include/

include ../lib.mk
2 changes: 1 addition & 1 deletion tools/testing/selftests/gpio/gpio-mockup-cdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int main(int argc, char *argv[])
{
char *chip;
int opt, ret, cfd, lfd;
unsigned int offset, val, abiv;
unsigned int offset, val = 0, abiv;
uint32_t flags_v1;
uint64_t flags_v2;

Expand Down

0 comments on commit 4479169

Please sign in to comment.