Merge tag 'fbdev-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/delle...

Pull fbdev updates from Helge Deller:
 "Code cleanups for offb, shmobile, sisfb, savage, au1200fb, uvesafb,
  omap2 and sh7760fb, as well as the addition of some HAS_IOPORT
  dependencies and adjustment of generated logo file to make build
  reproducible"

* tag 'fbdev-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: offb: replace of_node_put with __free(device_node)
  fbdev: savage: Handle err return when savagefb_check_var failed
  video: hdmi: prefer length specifier in format over string copying
  fbdev: uvesafb: replace deprecated strncpy with strscpy_pad
  fbdev: au1200fb: replace deprecated strncpy with strscpy
  fbdev: fsl-diu-fb: replace deprecated strncpy with strscpy_pad
  video: logo: Drop full path of the input filename in generated file
  fbdev: add HAS_IOPORT dependencies
  fbdev: sh7760fb: allow modular build
  fbdev: sisfb: hide unused variables
  fbdev: shmobile: fix snprintf truncation
  fbdev: omap2: replace of_graph_get_next_endpoint()

diff --combined drivers/video/fbdev/Kconfig
index 197b6d5268e941c2b272c2b4d353907ce4c0b768,5befe481af7da8074b0bdd6bed505cf2cf0a0429..ea36c6956bf36103772c576e8fc0d29c830958e2
--- 1/drivers/video/fbdev/Kconfig
--- 2/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@@ -157,7 -157,7 +157,7 @@@ config FB_IM
  
  config FB_CYBER2000
        tristate "CyberPro 2000/2010/5000 support"
-       depends on FB && PCI && (BROKEN || !SPARC64)
+       depends on FB && PCI && HAS_IOPORT && (BROKEN || !SPARC64)
        select FB_IOMEM_HELPERS
        help
          This enables support for the Integraphics CyberPro 20x0 and 5000
@@@ -245,7 -245,7 +245,7 @@@ config FB_FM
  
  config FB_ARC
        tristate "Arc Monochrome LCD board support"
-       depends on FB && (X86 || COMPILE_TEST)
+       depends on FB && HAS_IOPORT && (X86 || COMPILE_TEST)
        select FB_SYSMEM_HELPERS_DEFERRED
        help
          This enables support for the Arc Monochrome LCD board. The board
@@@ -494,7 -494,6 +494,7 @@@ config FB_SBUS_HELPER
        select FB_CFB_COPYAREA
        select FB_CFB_FILLRECT
        select FB_CFB_IMAGEBLIT
 +      select FB_IOMEM_FOPS
  
  config FB_BW2
        bool "BWtwo support"
@@@ -515,7 -514,6 +515,7 @@@ config FB_CG
        depends on (FB = y) && (SPARC && FB_SBUS)
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
 +      select FB_IOMEM_FOPS
        help
          This is the frame buffer device driver for the CGsix (GX, TurboGX)
          frame buffer.
@@@ -525,7 -523,6 +525,7 @@@ config FB_FF
        depends on FB_SBUS && SPARC64
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
 +      select FB_IOMEM_FOPS
        help
          This is the frame buffer device driver for the Creator, Creator3D,
          and Elite3D graphics boards.
@@@ -1046,7 -1043,7 +1046,7 @@@ config FB_ATY_BACKLIGH
  
  config FB_S3
        tristate "S3 Trio/Virge support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1107,7 -1104,7 +1107,7 @@@ config FB_SAVAGE_ACCE
  
  config FB_SIS
        tristate "SiS/XGI display support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select BOOT_VESA_SUPPORT if FB_SIS = y
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@@ -1138,7 -1135,7 +1138,7 @@@ config FB_SIS_31
  
  config FB_VIA
        tristate "VIA UniChrome (Pro) and Chrome9 display support"
-       depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST)
+       depends on FB && PCI && GPIOLIB && I2C && HAS_IOPORT && (X86 || COMPILE_TEST)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1177,7 -1174,7 +1177,7 @@@ endi
  
  config FB_NEOMAGIC
        tristate "NeoMagic display support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1204,7 -1201,7 +1204,7 @@@ config FB_KYR
  
  config FB_3DFX
        tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1252,7 -1249,7 +1252,7 @@@ config FB_VOODOO
  
  config FB_VT8623
        tristate "VIA VT8623 support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1267,7 -1264,7 +1267,7 @@@
  
  config FB_TRIDENT
        tristate "Trident/CyberXXX/CyberBlade support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1290,7 -1287,7 +1290,7 @@@
  
  config FB_ARK
        tristate "ARK 2000PV support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1648,8 -1645,8 +1648,8 @@@ config FB_COBAL
        select FB_IOMEM_HELPERS
  
  config FB_SH7760
-       bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
-       depends on FB=y && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \
+       tristate "SH7760/SH7763/SH7720/SH7721 LCDC support"
+       depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \
                || CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721)
        select FB_IOMEM_HELPERS
        help
@@@ -1814,7 -1811,7 +1814,7 @@@ config FB_SSD130
  
  config FB_SM712
        tristate "Silicon Motion SM712 framebuffer support"
-       depends on FB && PCI
+       depends on FB && PCI && HAS_IOPORT
        select FB_IOMEM_HELPERS
        help
          Frame buffer driver for the Silicon Motion SM710, SM712, SM721