diff options
| author | Daniel Vetter | 2017-11-21 11:33:10 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2017-11-21 14:17:56 +0100 |
| commit | 70c5f93669249886b151812076509f30569aff80 (patch) | |
| tree | 05dce785f3a70e022b91016c87e4092f143a2fef /drivers/pinctrl/bcm/pinctrl-bcm2835.c | |
| parent | drm/sti: Handle return value of platform_get_irq_byname (diff) | |
| parent | Merge tag 'exynos-drm-next-for-v4.15' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | kernel-qcow2-linux-70c5f93669249886b151812076509f30569aff80.tar.gz kernel-qcow2-linux-70c5f93669249886b151812076509f30569aff80.tar.xz kernel-qcow2-linux-70c5f93669249886b151812076509f30569aff80.zip | |
Merge airlied/drm-next into drm-misc-next
Bake in the conflict between the drm_print.h extraction and the
addition of DRM_DEBUG_LEASES since we lost it a few too many times.
Also fix a new use of drm_plane_helper_check_state in msm to follow
Ville's conversion in
commit a01cb8ba3f6282934cff65e89ab36b18b14cbe27
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed Nov 1 22:16:19 2017 +0200
drm: Move drm_plane_helper_check_state() into drm_atomic_helper.c
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/pinctrl/bcm/pinctrl-bcm2835.c')
| -rw-r--r-- | drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 0944310225db..ff782445dfb7 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -373,16 +373,12 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc, unsigned long events; unsigned offset; unsigned gpio; - unsigned int type; events = bcm2835_gpio_rd(pc, GPEDS0 + bank * 4); events &= mask; events &= pc->enabled_irq_map[bank]; for_each_set_bit(offset, &events, 32) { gpio = (32 * bank) + offset; - /* FIXME: no clue why the code looks up the type here */ - type = pc->irq_type[gpio]; - generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irqdomain, gpio)); } |