diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 02:51:32 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 02:51:32 +0400 |
| commit | 5f097cd249f00683442c3e265d6f27d80fc83563 (patch) | |
| tree | 6b354913fcb2a099aa26e017895e1e6fdf6385e2 /drivers/video/omap2/dss/venc_panel.c | |
| parent | a82a729f04232ccd0b59406574ba4cf20027a49d (diff) | |
| parent | 1b6c79361ba5ce30b40f0f7d6fc2421dc5fcbe0c (diff) | |
| download | linux-5f097cd249f00683442c3e265d6f27d80fc83563.tar.xz | |
Merge tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev
Pull fbdev update from Jean-Christophe PLAGNIOL-VILLARD:
"Various fbdev changes for 3.11
- xilinxfb updates
- Small cleanups and fixes to multiple drivers
- OMAP display subsystem bug updates
- imxfb dt support"
* tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev: (95 commits)
video: imxfb: Add DT support
video: i740fb: Make i740fb_init static
fb: make fp_get_options name argument const
video: mmp: fix graphics/video layer enable/mask swap issue
video: mmp: fix memcpy wrong size for mmp_addr issue
radeon: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
aty128fb: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
video: of_display_timing.h: Declare 'display_timing'
fbdev: bfin-lq035q1-fb: Use dev_pm_ops
fbmem: return -EFAULT on copy_to_user() failure
OMAPDSS: DPI: Fix wrong pixel clock limit
video: replace strict_strtoul() with kstrtoul()
uvesafb: Correct/simplify warning message
fb: fix atyfb unused data warnings
fb: fix atyfb build warning
video: imxfb: Make local symbols static
video: udlfb: Make local symbol static
video: udlfb: Use NULL instead of 0
video: smscufx: Use NULL instead of 0
video: remove unnecessary platform_set_drvdata()
...
Diffstat (limited to 'drivers/video/omap2/dss/venc_panel.c')
| -rw-r--r-- | drivers/video/omap2/dss/venc_panel.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/venc_panel.c b/drivers/video/omap2/dss/venc_panel.c index 0d2b1a0834a0..f7d92c57bd73 100644 --- a/drivers/video/omap2/dss/venc_panel.c +++ b/drivers/video/omap2/dss/venc_panel.c @@ -107,19 +107,19 @@ static int venc_panel_probe(struct omap_dss_device *dssdev) dssdev->panel.timings = default_timings; - return device_create_file(&dssdev->dev, &dev_attr_output_type); + return device_create_file(dssdev->dev, &dev_attr_output_type); } static void venc_panel_remove(struct omap_dss_device *dssdev) { - device_remove_file(&dssdev->dev, &dev_attr_output_type); + device_remove_file(dssdev->dev, &dev_attr_output_type); } static int venc_panel_enable(struct omap_dss_device *dssdev) { int r; - dev_dbg(&dssdev->dev, "venc_panel_enable\n"); + dev_dbg(dssdev->dev, "venc_panel_enable\n"); mutex_lock(&venc_panel.lock); @@ -150,7 +150,7 @@ err: static void venc_panel_disable(struct omap_dss_device *dssdev) { - dev_dbg(&dssdev->dev, "venc_panel_disable\n"); + dev_dbg(dssdev->dev, "venc_panel_disable\n"); mutex_lock(&venc_panel.lock); @@ -167,7 +167,7 @@ end: static void venc_panel_set_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings) { - dev_dbg(&dssdev->dev, "venc_panel_set_timings\n"); + dev_dbg(dssdev->dev, "venc_panel_set_timings\n"); mutex_lock(&venc_panel.lock); @@ -180,21 +180,21 @@ static void venc_panel_set_timings(struct omap_dss_device *dssdev, static int venc_panel_check_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings) { - dev_dbg(&dssdev->dev, "venc_panel_check_timings\n"); + dev_dbg(dssdev->dev, "venc_panel_check_timings\n"); return omapdss_venc_check_timings(dssdev, timings); } static u32 venc_panel_get_wss(struct omap_dss_device *dssdev) { - dev_dbg(&dssdev->dev, "venc_panel_get_wss\n"); + dev_dbg(dssdev->dev, "venc_panel_get_wss\n"); return omapdss_venc_get_wss(dssdev); } static int venc_panel_set_wss(struct omap_dss_device *dssdev, u32 wss) { - dev_dbg(&dssdev->dev, "venc_panel_set_wss\n"); + dev_dbg(dssdev->dev, "venc_panel_set_wss\n"); return omapdss_venc_set_wss(dssdev, wss); } |