diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 11:47:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 11:47:14 -0700 |
commit | cb273eb7c8390c70a484db6c79a797e377db09b5 (patch) | |
tree | 4f7ea8f21c446a880dbad90c0b76ce573e85ee77 /drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | |
parent | 24777bac4af5fcddb0cf4a7d8a2b6ee2a98fe6fd (diff) | |
parent | 8b5ea9029b03efda74292c57e0377a98ed0b7434 (diff) |
Merge tag 'fbdev-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller:
- Detect VGA compatibility from VESA attributes (Thomas Zimmermann)
- Make I2C terminology more inclusive in smscufx and viafb (Easwar
Hariharan)
- Add lots of missing MODULE_DESCRIPTION() macros (Jeff Johnson)
- Logo code cleanups (Geert Uytterhoeven)
- Minor fixes by Chen Ni, Kuninori Morimoto, Uwe Kleine-König and
Christophe Jaillett
* tag 'fbdev-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (21 commits)
fbdev: viafb: Make I2C terminology more inclusive
fbdev: smscufx: Make I2C terminology more inclusive
fbdev: omap2: Return clk_prepare_enable to transfer the error
fbdev: mmp: Constify struct mmp_overlay_ops
fbdev: Drop explicit initialization of struct i2c_device_id::driver_data to 0
video: agp: add remaining missing MODULE_DESCRIPTION() macros
video: console: add missing MODULE_DESCRIPTION() macros
fbdev: amifb: add missing MODULE_DESCRIPTION() macro
fbdev: c2p_planar: add missing MODULE_DESCRIPTION() macro
fbdev: vesafb: Detect VGA compatibility from screen info's VESA attributes
fbdev: omapfb: use of_graph_get_remote_port()
fbdev: omapdss: use for_each_endpoint_of_node()
fbdev: offb: add missing MODULE_DESCRIPTION() macro
fbdev: vfb: add missing MODULE_DESCRIPTION() macro
fbdev: macmodes: add missing MODULE_DESCRIPTION() macro
fbdev: goldfishfb: add missing MODULE_DESCRIPTION() macro
fbdev: kyro: add missing MODULE_DESCRIPTION() macro
fbdev: viafb: add missing MODULE_DESCRIPTION() macro
fbdev: matroxfb: add missing MODULE_DESCRIPTION() macros
video/logo: Remove linux_serial_image comments
...
Diffstat (limited to 'drivers/video/fbdev/omap2/omapfb/dss/dss-of.c')
-rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c index 14965a3fd05b..4040e247e026 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c @@ -117,19 +117,6 @@ u32 dss_of_port_get_port_number(struct device_node *port) return reg; } -static struct device_node *omapdss_of_get_remote_port(const struct device_node *node) -{ - struct device_node *np; - - np = of_graph_get_remote_endpoint(node); - if (!np) - return NULL; - - np = of_get_next_parent(np); - - return np; -} - struct omap_dss_device * omapdss_of_find_source_for_first_ep(struct device_node *node) { @@ -141,7 +128,7 @@ omapdss_of_find_source_for_first_ep(struct device_node *node) if (!ep) return ERR_PTR(-EINVAL); - src_port = omapdss_of_get_remote_port(ep); + src_port = of_graph_get_remote_port(ep); if (!src_port) { of_node_put(ep); return ERR_PTR(-EINVAL); |