GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: bridge: dw-hdmi: Remove unneeded arguments to bind/unbind functions

Browse source 
The master argument isn't used. The data argument, a void pointer, is
used by the bind function only where it's cast to a drm_device pointer,
which can easily be obtained from the encoder argument instead. Remove
them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-3-laurent.pinchart+renesas@ideasonboard.com
This commit is contained in:
Laurent Pinchart 2017-01-17 10:28:52 +02:00 • committed by Archit Taneja
parent cc7e962327
commit ecaa98f1e6
4 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/bridge/dw-hdmi.c
View file

@ -1854,12 +1854,10 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi)
return 0; return 0;
} }
int dw_hdmi_bind(struct device *dev, struct device *master, int dw_hdmi_bind(struct device *dev, struct drm_encoder *encoder,
void *data, struct drm_encoder *encoder,
struct resource *iores, int irq, struct resource *iores, int irq,
const struct dw_hdmi_plat_data *plat_data) const struct dw_hdmi_plat_data *plat_data)
{ {
struct drm_device *drm = data;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct platform_device_info pdevinfo; struct platform_device_info pdevinfo;
struct device_node *ddc_node; struct device_node *ddc_node;
@ -1992,7 +1990,7 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
if (ret) if (ret)
goto err_iahb; goto err_iahb;
ret = dw_hdmi_register(drm, hdmi); ret = dw_hdmi_register(encoder->dev, hdmi);
if (ret) if (ret)
goto err_iahb; goto err_iahb;
@ -2059,7 +2057,7 @@ err_res:
} }
EXPORT_SYMBOL_GPL(dw_hdmi_bind); EXPORT_SYMBOL_GPL(dw_hdmi_bind);
void dw_hdmi_unbind(struct device *dev, struct device *master, void *data) void dw_hdmi_unbind(struct device *dev)
{ {
struct dw_hdmi *hdmi = dev_get_drvdata(dev); struct dw_hdmi *hdmi = dev_get_drvdata(dev);

4
drivers/gpu/drm/imx/dw_hdmi-imx.c
View file

@ -249,7 +249,7 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master,
drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs, drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs,
DRM_MODE_ENCODER_TMDS, NULL); DRM_MODE_ENCODER_TMDS, NULL);
ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); ret = dw_hdmi_bind(dev, encoder, iores, irq, plat_data);
/* /*
* If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(),
@ -264,7 +264,7 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master,
static void dw_hdmi_imx_unbind(struct device *dev, struct device *master, static void dw_hdmi_imx_unbind(struct device *dev, struct device *master,
void *data) void *data)
{ {
return dw_hdmi_unbind(dev, master, data); return dw_hdmi_unbind(dev);
} }
static const struct component_ops dw_hdmi_imx_ops = { static const struct component_ops dw_hdmi_imx_ops = {

4
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View file

@ -301,7 +301,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
DRM_MODE_ENCODER_TMDS, NULL); DRM_MODE_ENCODER_TMDS, NULL);
ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); ret = dw_hdmi_bind(dev, encoder, iores, irq, plat_data);
/* /*
* If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(),
@ -316,7 +316,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,
void *data) void *data)
{ {
return dw_hdmi_unbind(dev, master, data); return dw_hdmi_unbind(dev);
} }
static const struct component_ops dw_hdmi_rockchip_ops = { static const struct component_ops dw_hdmi_rockchip_ops = {

5
include/drm/bridge/dw_hdmi.h
View file

@ -56,9 +56,8 @@ struct dw_hdmi_plat_data {
struct drm_display_mode *mode); struct drm_display_mode *mode);
}; };
void dw_hdmi_unbind(struct device *dev, struct device *master, void *data); void dw_hdmi_unbind(struct device *dev);
int dw_hdmi_bind(struct device *dev, struct device *master, int dw_hdmi_bind(struct device *dev, struct drm_encoder *encoder,
void *data, struct drm_encoder *encoder,
struct resource *iores, int irq, struct resource *iores, int irq,
const struct dw_hdmi_plat_data *plat_data); const struct dw_hdmi_plat_data *plat_data);