mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

gpio fixes for v5.16-rc2

Browse source 
- fix a coccicheck warning in gpio-virtio
 - fix gpio selftests build issues
 - fix a Kconfig issue in gpio-rockchip
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmGXvMwACgkQEacuoBRx
 13KEIg/+PpcY0dNNYy1lhkcnmTvkv8are53pRdt63ERGNc+tcqXhmz+3fe6cUp9q
 lvsV2dIXoVKBVV3ppuPRuf88a35X7rUclO5B01fXjr7h08GRYK9x+7/FRmEO+Tw6
 LveDDYg48W96W34id3FgI3U5OIBIgRJ4WU0j6qmJWpsLFCgEHbI7nxcIgiOcpcZJ
 YEkuuS8v7oJqwZAvzKO9rN2kB/nUQroJLjCRWeitjCjmDKFp+K3J2ZrZ9IFKOL8F
 JivC343MEnC04SQtOdnek0s6KbhAQhL2/0nzkg335AKLT4yRO2rYcLs+6ral45aJ
 KYOkrZNmRnDyEB338kK7sfW3M4sJGREjfhFTVf14RaCcJJFGCLIdYAabvCSDIWcQ
 ex2bSs8uu5sbjHwz/N0Jw75yhHKNgfOH7VNp9XrJ/gf2ADdH2YKiwJFspON83ubo
 JX2wciQz41baRxBQmfR6RvpRXxJUBIuU79d0/RcjXrwZnMD0QOvQNyVjoOeKMNd/
 W1CEYxHGachTeBuussnIGGJdegoLgOVYGsvW/SnLNST/QWjh3p0k3Wmkgx0rHN3i
 FbcQSDiIxO2F/q+teLc2+IsrXgJ5PZJiDw8Gki6oY983xk8TpacQOZahuy9Wpld8
 5ew5adVuUfMxJde7Je6pDdWVvd1LHuzmf8tbcdeEX+XYyqdz7tI=
 =eoKj
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-11-19 11:02:09 -08:00
commit 4479169824
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpio/Kconfig
View file

@ -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

2
drivers/gpio/gpio-virtio.c
View file

@ -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)

1
tools/testing/selftests/gpio/Makefile
View file

@ -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
tools/testing/selftests/gpio/gpio-mockup-cdev.c
View file

@ -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;