From: jsg Date: Thu, 18 Aug 2022 01:04:54 +0000 (+0000) Subject: drm/bridge: Move devm_drm_of_get_bridge to bridge/panel.c X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f099161298248822a78c9b8d67a270fd32701bb9;p=openbsd drm/bridge: Move devm_drm_of_get_bridge to bridge/panel.c From Maxime Ripard f2725951579701420879c29e87043e77537ac0c6 in linux 5.15.y/5.15.61 d4ae66f10c8b9959dce1766d9a87070e567236eb in mainline linux --- diff --git a/sys/dev/pci/drm/drm_bridge.c b/sys/dev/pci/drm/drm_bridge.c index 0a2a67d079d..0d871981847 100644 --- a/sys/dev/pci/drm/drm_bridge.c +++ b/sys/dev/pci/drm/drm_bridge.c @@ -1232,40 +1232,6 @@ struct drm_bridge *of_drm_find_bridge(struct device_node *np) return NULL; } EXPORT_SYMBOL(of_drm_find_bridge); - -/** - * devm_drm_of_get_bridge - Return next bridge in the chain - * @dev: device to tie the bridge lifetime to - * @np: device tree node containing encoder output ports - * @port: port in the device tree node - * @endpoint: endpoint in the device tree node - * - * Given a DT node's port and endpoint number, finds the connected node - * and returns the associated bridge if any, or creates and returns a - * drm panel bridge instance if a panel is connected. - * - * Returns a pointer to the bridge if successful, or an error pointer - * otherwise. - */ -struct drm_bridge *devm_drm_of_get_bridge(struct device *dev, - struct device_node *np, - u32 port, u32 endpoint) -{ - struct drm_bridge *bridge; - struct drm_panel *panel; - int ret; - - ret = drm_of_find_panel_or_bridge(np, port, endpoint, - &panel, &bridge); - if (ret) - return ERR_PTR(ret); - - if (panel) - bridge = devm_drm_panel_bridge_add(dev, panel); - - return bridge; -} -EXPORT_SYMBOL(devm_drm_of_get_bridge); #endif MODULE_AUTHOR("Ajay Kumar ");