Commit 9c4b86eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.18/fbdev-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev updates from Helge Deller:
 "Lots of small fixes and code cleanups across most of the fbdev
  drivers.

  This includes conversions to use helper functions, const conversions,
  spelling fixes, help text updates, adding return value checks, small
  build fixes, and much more"

* tag 'for-5.18/fbdev-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (59 commits)
  video: fbdev: kyro: make read-only array ODValues static const
  video: fbdev: offb: fix warning comparing pointer to 0
  video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
  video: fbdev: sm712fb: Fix crash in smtcfb_write()
  video: fbdev: s3c-fb: fix platform_get_irq.cocci warning
  video: fbdev: sm712fb: Fix crash in smtcfb_read()
  video: fbdev: via: check the return value of kstrdup()
  video: fbdev: au1100fb: Spelling s/palette/palette/
  video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
  video: fbdev: atari: Remove unused atafb_setcolreg()
  video: fbdev: atari: Convert to standard round_up() helper
  video: fbdev: atari: Fix TT High video mode
  video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit
  video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
  video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
  video: fbdev: omapfb: Use sysfs_emit() instead of snprintf()
  video: fbdev: s3c-fb: Use platform_get_irq() to get the interrupt
  video: fbdev: Fix wrong file path for pvr2fb.c in Kconfig help text
  video: fbdev: pxa3xx-gcu: Remove unnecessary print function dev_err()
  video: fbdev: pxa168fb: Remove unnecessary print function dev_err()
  ...
parents 5bebe2c9 e445c8b2

Documentation/devicetree/bindings/display/simple-framebuffer.yaml

+7 −5
Original line number Original line Diff line number Diff line
@@ -52,12 +52,14 @@ description: |+ 




properties:

properties:

  compatible:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

          - enum:

              - apple,simple-framebuffer

              - apple,simple-framebuffer

              - allwinner,simple-framebuffer

              - allwinner,simple-framebuffer

              - amlogic,simple-framebuffer

              - amlogic,simple-framebuffer

          - const: simple-framebuffer

          - const: simple-framebuffer

      - const: simple-framebuffer





  reg:

  reg:

    description: Location and size of the framebuffer memory

    description: Location and size of the framebuffer memory

arch/parisc/include/asm/agp.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -8,8 +8,8 @@ 
 *

 *

 */

 */





#define map_page_into_agp(page)		/* nothing */

#define map_page_into_agp(page)		do { } while (0)

#define unmap_page_from_agp(page)	/* nothing */

#define unmap_page_from_agp(page)	do { } while (0)

#define flush_agp_cache()		mb()

#define flush_agp_cache()		mb()





/* GATT allocation. Returns/accepts GATT kernel virtual address. */

/* GATT allocation. Returns/accepts GATT kernel virtual address. */

arch/powerpc/include/asm/agp.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ 




#include <asm/io.h>

#include <asm/io.h>





#define map_page_into_agp(page)

#define map_page_into_agp(page) do {} while (0)

#define unmap_page_from_agp(page)

#define unmap_page_from_agp(page) do {} while (0)

#define flush_agp_cache() mb()

#define flush_agp_cache() mb()





/* GATT allocation. Returns/accepts GATT kernel virtual address. */

/* GATT allocation. Returns/accepts GATT kernel virtual address. */

arch/sparc/include/asm/agp.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -4,8 +4,8 @@ 




/* dummy for now */

/* dummy for now */





#define map_page_into_agp(page)

#define map_page_into_agp(page)		do { } while (0)

#define unmap_page_from_agp(page)

#define unmap_page_from_agp(page)	do { } while (0)

#define flush_agp_cache()		mb()

#define flush_agp_cache()		mb()





/* GATT allocation. Returns/accepts GATT kernel virtual address. */

/* GATT allocation. Returns/accepts GATT kernel virtual address. */

drivers/video/backlight/lm3630a_bl.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -594,7 +594,6 @@ static int lm3630a_remove(struct i2c_client *client) 




	if (pchip->irq) {

	if (pchip->irq) {

		free_irq(pchip->irq, pchip);

		free_irq(pchip->irq, pchip);

		flush_workqueue(pchip->irqthread);

		destroy_workqueue(pchip->irqthread);

		destroy_workqueue(pchip->irqthread);

	}

	}

	return 0;

	return 0;