Commit 44791698 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'gpio-fixes-for-v5.16-rc2' of git://git.kernel.org/pub/scm/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
parents ad44518a d6912b12
...@@ -523,6 +523,7 @@ config GPIO_REG ...@@ -523,6 +523,7 @@ config GPIO_REG
config GPIO_ROCKCHIP config GPIO_ROCKCHIP
tristate "Rockchip GPIO support" tristate "Rockchip GPIO support"
depends on ARCH_ROCKCHIP || COMPILE_TEST depends on ARCH_ROCKCHIP || COMPILE_TEST
select GENERIC_IRQ_CHIP
select GPIOLIB_IRQCHIP select GPIOLIB_IRQCHIP
default ARCH_ROCKCHIP default ARCH_ROCKCHIP
help help
......
...@@ -434,7 +434,7 @@ static void virtio_gpio_event_vq(struct virtqueue *vq) ...@@ -434,7 +434,7 @@ static void virtio_gpio_event_vq(struct virtqueue *vq)
ret = generic_handle_domain_irq(vgpio->gc.irq.domain, gpio); ret = generic_handle_domain_irq(vgpio->gc.irq.domain, gpio);
if (ret) if (ret)
dev_err(dev, "failed to handle interrupt: %d\n", ret); dev_err(dev, "failed to handle interrupt: %d\n", ret);
}; }
} }
static void virtio_gpio_request_vq(struct virtqueue *vq) static void virtio_gpio_request_vq(struct virtqueue *vq)
......
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
TEST_PROGS := gpio-mockup.sh TEST_PROGS := gpio-mockup.sh
TEST_FILES := gpio-mockup-sysfs.sh TEST_FILES := gpio-mockup-sysfs.sh
TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev
CFLAGS += -O2 -g -Wall -I../../../../usr/include/
include ../lib.mk include ../lib.mk
...@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) ...@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
{ {
char *chip; char *chip;
int opt, ret, cfd, lfd; int opt, ret, cfd, lfd;
unsigned int offset, val, abiv; unsigned int offset, val = 0, abiv;
uint32_t flags_v1; uint32_t flags_v1;
uint64_t flags_v2; uint64_t flags_v2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment