diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.c b/drivers/dma-buf/rk_heaps/rk-dma-heap.c index d93d7cd3097d..bb217dfe91df 100644 --- a/drivers/dma-buf/rk_heaps/rk-dma-heap.c +++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.c @@ -613,7 +613,7 @@ static int rk_dma_heap_debug_show(struct seq_file *s, void *unused) mutex_lock(&rk_heap_list_lock); list_for_each_entry(heap, &rk_heap_list, list) { heap->s = s; - get_each_dmabuf(rk_dma_heap_dump_dmabuf, heap); + dma_buf_get_each(rk_dma_heap_dump_dmabuf, heap); rk_dma_heap_dump_contig(heap); total += heap->total_size; } @@ -662,7 +662,7 @@ static int rk_dma_heap_proc_show(struct seq_file *s, void *unused) mutex_lock(&rk_heap_list_lock); list_for_each_entry(heap, &rk_heap_list, list) { heap->s = s; - get_each_dmabuf(rk_dma_heap_dump_dmabuf, heap); + dma_buf_get_each(rk_dma_heap_dump_dmabuf, heap); rk_dma_heap_dump_contig(heap); total += heap->total_size; } diff --git a/drivers/gpu/drm/bridge/maxim-max96745.c b/drivers/gpu/drm/bridge/maxim-max96745.c index 9755f129f519..2c757e2c2fff 100644 --- a/drivers/gpu/drm/bridge/maxim-max96745.c +++ b/drivers/gpu/drm/bridge/maxim-max96745.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/gpu/drm/bridge/maxim-max96755f.c b/drivers/gpu/drm/bridge/maxim-max96755f.c index bfabb61c166a..a61395b876f0 100644 --- a/drivers/gpu/drm/bridge/maxim-max96755f.c +++ b/drivers/gpu/drm/bridge/maxim-max96755f.c @@ -466,10 +466,12 @@ static int max96755f_link_parse(struct max96755f_bridge *ser) switch (nr) { case 2: ser->split_mode = true; + break; case 1: break; default: ret = -EINVAL; + break; } return ret; diff --git a/drivers/gpu/drm/rockchip/dw-dp.c b/drivers/gpu/drm/rockchip/dw-dp.c index 75c75c287543..90c8093fb476 100644 --- a/drivers/gpu/drm/rockchip/dw-dp.c +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -3854,13 +3854,6 @@ static void dw_dp_unregister_audio_driver(void *data) } } -static void dw_dp_aux_unregister(void *data) -{ - struct dw_dp *dp = data; - - drm_dp_aux_unregister(&dp->aux); -} - static int dw_dp_bind(struct device *dev, struct device *master, void *data) { struct dw_dp *dp = dev_get_drvdata(dev); @@ -3869,6 +3862,14 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data) struct drm_bridge *bridge = &dp->bridge; int ret; + dp->aux.dev = dev; + dp->aux.drm_dev = drm_dev; + dp->aux.name = dev_name(dev); + dp->aux.transfer = dw_dp_aux_transfer; + ret = drm_dp_aux_register(&dp->aux); + if (ret) + return ret; + if (!dp->left) { drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS); drm_encoder_helper_add(encoder, &dw_dp_encoder_helper_funcs); @@ -3879,7 +3880,7 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data) ret = drm_bridge_attach(encoder, bridge, NULL, 0); if (ret) { dev_err(dev, "failed to attach bridge: %d\n", ret); - return ret; + goto error_unregister_aux; } } @@ -3892,7 +3893,7 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data) ret = drm_bridge_attach(encoder, &secondary->bridge, last_bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) - return ret; + goto error_unregister_aux; } pm_runtime_enable(dp->dev); @@ -3903,12 +3904,18 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data) enable_irq(dp->hpd_irq); return 0; + +error_unregister_aux: + drm_dp_aux_unregister(&dp->aux); + return ret; } static void dw_dp_unbind(struct device *dev, struct device *master, void *data) { struct dw_dp *dp = dev_get_drvdata(dev); + drm_dp_aux_unregister(&dp->aux); + if (dp->hpd_gpio) disable_irq(dp->hpd_irq); disable_irq(dp->irq); @@ -4127,17 +4134,6 @@ static int dw_dp_probe(struct platform_device *pdev) if (ret) return ret; - dp->aux.dev = dev; - dp->aux.name = dev_name(dev); - dp->aux.transfer = dw_dp_aux_transfer; - ret = drm_dp_aux_register(&dp->aux); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, dw_dp_aux_unregister, dp); - if (ret) - return ret; - dp->bridge.of_node = dev->of_node; dp->bridge.funcs = &dw_dp_bridge_funcs; dp->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c index a3c92195e2dd..421f6530971a 100644 --- a/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c index 7b2cf22f5742..b74ea238dc00 100755 --- a/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #define REG(x) ((x) + 0x30000) diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c index 61326b1477cc..57496ff9dec7 100644 --- a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/input/touchscreen/elan/elan_ts.c b/drivers/input/touchscreen/elan/elan_ts.c index 131e6fd55035..7fa1e6ec0f0d 100644 --- a/drivers/input/touchscreen/elan/elan_ts.c +++ b/drivers/input/touchscreen/elan/elan_ts.c @@ -1463,11 +1463,12 @@ static long elan_iap_ioctl( struct file *filp, unsigned int cmd, unsigned long a case IOCTL_I2C_INT: put_user(gpio_get_value(ts->hw_info.intr_gpio), ip); break; - case IOCTL_USER_HANDLE_IRQ: - ts->user_handle_irq = 1; - break; - case IOCTL_KERN_HANDLE_IRQ: - ts->user_handle_irq = 0; + case IOCTL_USER_HANDLE_IRQ: + ts->user_handle_irq = 1; + break; + case IOCTL_KERN_HANDLE_IRQ: + ts->user_handle_irq = 0; + break; default: break; } diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig index 0a6a11ca9549..40289d854b9a 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -276,7 +276,7 @@ config RK_DMABUF_PROCFS depends on PROC_FS help Turns on this to create a procfs debug interface for dma-buf, support - get information from db_list by get_each_dmabuf. + get information from db_list by dma_buf_get_each. If unsure, say "N". diff --git a/drivers/soc/rockchip/rk_dmabuf_procfs.c b/drivers/soc/rockchip/rk_dmabuf_procfs.c index 943b196e2b9c..0ca0dbde0545 100644 --- a/drivers/soc/rockchip/rk_dmabuf_procfs.c +++ b/drivers/soc/rockchip/rk_dmabuf_procfs.c @@ -118,7 +118,7 @@ static int rk_dmabuf_sgt_show(struct seq_file *s, void *v) seq_printf(s, "%16s %-16s %-16s %14s %8s\n\n", "DMABUF", "NAME", "EXPORT", "SIZE:KiB", "SGLIST"); - return get_each_dmabuf(rk_dmabuf_cb, s); + return dma_buf_get_each(rk_dmabuf_cb, s); } static int rk_dmabuf_dev_show(struct seq_file *s, void *v) @@ -126,7 +126,7 @@ static int rk_dmabuf_dev_show(struct seq_file *s, void *v) seq_printf(s, "%16s %-16s %-16s %14s %8s\n\n", "DMABUF", "NAME", "EXPORT", "SIZE:KiB", "AttachedDevices"); - return get_each_dmabuf(rk_dmabuf_cb3, s); + return dma_buf_get_each(rk_dmabuf_cb3, s); } static int rk_dmabuf_size_show(struct seq_file *s, void *v)