summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/bridge/ps862x.c2
-rw-r--r--drivers/video/console_truetype.c6
-rw-r--r--drivers/video/imx/ipu_common.c10
-rw-r--r--drivers/video/imx/ipu_disp.c6
-rw-r--r--drivers/video/imx/mxc_ipuv3_fb.c4
-rw-r--r--drivers/video/meson/simplefb_common.h2
-rw-r--r--drivers/video/panel-uclass.c2
-rw-r--r--drivers/video/rockchip/rk_hdmi.h6
-rw-r--r--drivers/video/rockchip/rk_vop.c2
-rw-r--r--drivers/video/rockchip/rk_vop.h4
-rw-r--r--drivers/video/sunxi/simplefb_common.h2
-rw-r--r--drivers/video/tegra.c2
-rw-r--r--drivers/video/ti/am335x-fb.c4
-rw-r--r--drivers/video/video_bmp.c2
-rw-r--r--drivers/video/videomodes.c2
15 files changed, 28 insertions, 28 deletions
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index c8e105857f..d1d22a6e23 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
* @param addr_off offset from the i2c base address for ps8622
* @param reg_addr register address to write
* @param value value to be written
- * @return 0 on success, non-0 on failure
+ * Return: 0 on success, non-0 on failure
*/
static int ps8622_write(struct udevice *dev, unsigned addr_off,
unsigned char reg_addr, unsigned char value)
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index de8b86bbac..c04b449a6d 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -368,7 +368,7 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y,
* @xend: X end position in pixels from the left
* @yend: Y end position in pixels from the top
* @clr: Value to write
- * @return 0 if OK, -ENOSYS if the display depth is not supported
+ * Return: 0 if OK, -ENOSYS if the display depth is not supported
*/
static int console_truetype_erase(struct udevice *dev, int xstart, int ystart,
int xend, int yend, int clr)
@@ -429,7 +429,7 @@ static int console_truetype_erase(struct udevice *dev, int xstart, int ystart,
* not been entered.
*
* @dev: Device to update
- * @return 0 if OK, -ENOSYS if not supported
+ * Return: 0 if OK, -ENOSYS if not supported
*/
static int console_truetype_backspace(struct udevice *dev)
{
@@ -535,7 +535,7 @@ static struct font_info font_table[] = {
*
* This searched for the first available font.
*
- * @return pointer to the font, or NULL if none is found
+ * Return: pointer to the font, or NULL if none is found
*/
static u8 *console_truetype_find_font(void)
{
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index 5908b23acc..54d1efc8f5 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -457,7 +457,7 @@ static void ipu_reset(void)
* @param dev The device structure for the IPU passed in by the
* driver framework.
*
- * @return Returns 0 on success or negative error code on error
+ * Return: Returns 0 on success or negative error code on error
*/
int ipu_probe(void)
{
@@ -574,7 +574,7 @@ void ipu_dump_registers(void)
* @param params Input parameter containing union of channel
* initialization parameters.
*
- * @return Returns 0 on success or negative error code on fail
+ * Return: Returns 0 on success or negative error code on fail
*/
int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params)
{
@@ -1006,7 +1006,7 @@ static void ipu_ch_param_init(int ch,
* @param v private v offset for additional cropping,
* zero if not used.
*
- * @return Returns 0 on success or negative error code on fail
+ * Return: Returns 0 on success or negative error code on fail
*/
int32_t ipu_init_channel_buffer(ipu_channel_t channel, ipu_buffer_t type,
uint32_t pixel_fmt,
@@ -1061,7 +1061,7 @@ int32_t ipu_init_channel_buffer(ipu_channel_t channel, ipu_buffer_t type,
*
* @param channel Input parameter for the logical channel ID.
*
- * @return This function returns 0 on success or negative error code on
+ * Return: This function returns 0 on success or negative error code on
* fail.
*/
int32_t ipu_enable_channel(ipu_channel_t channel)
@@ -1139,7 +1139,7 @@ void ipu_clear_buffer_ready(ipu_channel_t channel, ipu_buffer_t type,
* @param wait_for_stop Flag to set whether to wait for channel end
* of frame or return immediately.
*
- * @return This function returns 0 on success or negative error code on
+ * Return: This function returns 0 on success or negative error code on
* fail.
*/
int32_t ipu_disable_channel(ipu_channel_t channel)
diff --git a/drivers/video/imx/ipu_disp.c b/drivers/video/imx/ipu_disp.c
index 45069897fa..144322e4e2 100644
--- a/drivers/video/imx/ipu_disp.c
+++ b/drivers/video/imx/ipu_disp.c
@@ -822,7 +822,7 @@ static int ipu_pixfmt_to_map(uint32_t fmt)
*
* @param sig Bitfield of signal polarities for LCD interface.
*
- * @return This function returns 0 on success or negative error code on
+ * Return: This function returns 0 on success or negative error code on
* fail.
*/
@@ -1171,7 +1171,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk,
*
* @param alpha Global alpha value.
*
- * @return Returns 0 on success or negative error code on fail
+ * Return: Returns 0 on success or negative error code on fail
*/
int32_t ipu_disp_set_global_alpha(ipu_channel_t channel, unsigned char enable,
uint8_t alpha)
@@ -1226,7 +1226,7 @@ int32_t ipu_disp_set_global_alpha(ipu_channel_t channel, unsigned char enable,
*
* @param colorKey 24-bit RGB color for transparent color key.
*
- * @return Returns 0 on success or negative error code on fail
+ * Return: Returns 0 on success or negative error code on fail
*/
int32_t ipu_disp_set_color_key(ipu_channel_t channel, unsigned char enable,
uint32_t color_key)
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 6cdbbafafb..98228f2ad6 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -428,7 +428,7 @@ static int mxcfb_unmap_video_memory(struct fb_info *fbi)
* structures. This includes information such as bits per pixel,
* color maps, screen width/height and RGBA offsets.
*
- * @return Framebuffer structure initialized with our information
+ * Return: Framebuffer structure initialized with our information
*/
static struct fb_info *mxcfb_init_fbinfo(void)
{
@@ -479,7 +479,7 @@ extern struct clk *g_ipu_clk;
* this routine: Framebuffer initialization, Memory allocation and
* mapping, Framebuffer registration, IPU initialization.
*
- * @return Appropriate error code to the kernel common code
+ * Return: Appropriate error code to the kernel common code
*/
static int mxcfb_probe(struct udevice *dev, u32 interface_pix_fmt,
uint8_t disp, struct fb_videomode const *mode)
diff --git a/drivers/video/meson/simplefb_common.h b/drivers/video/meson/simplefb_common.h
index 9ea7b0486c..d0cc1b401f 100644
--- a/drivers/video/meson/simplefb_common.h
+++ b/drivers/video/meson/simplefb_common.h
@@ -14,7 +14,7 @@
*
* @blob: device tree blob
* @pipeline: display pipeline
- * @return device node offset in blob, or negative values if failed
+ * Return: device node offset in blob, or negative values if failed
*/
int meson_simplefb_fdt_match(void *blob, const char *pipeline);
diff --git a/drivers/video/panel-uclass.c b/drivers/video/panel-uclass.c
index bb2eaae2e9..1f7e20e0b5 100644
--- a/drivers/video/panel-uclass.c
+++ b/drivers/video/panel-uclass.c
@@ -26,7 +26,7 @@ int panel_enable_backlight(struct udevice *dev)
* @dev: Panel device containing the backlight to update
* @percent: Brightness value (0=off, 1=min brightness,
* 100=full brightness)
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
*/
int panel_set_backlight(struct udevice *dev, int percent)
{
diff --git a/drivers/video/rockchip/rk_hdmi.h b/drivers/video/rockchip/rk_hdmi.h
index 859a0b9ff3..200dbaea74 100644
--- a/drivers/video/rockchip/rk_hdmi.h
+++ b/drivers/video/rockchip/rk_hdmi.h
@@ -33,7 +33,7 @@ struct rk_hdmi_priv {
* @dev: device
* @buf: output buffer for the EDID
* @buf_size: number of bytes in the buffer
- * @return number of bytes read if OK, -ve if something went wrong
+ * Return: number of bytes read if OK, -ve if something went wrong
*/
int rk_hdmi_read_edid(struct udevice *dev, u8 *buf, int buf_size);
@@ -55,7 +55,7 @@ void rk_hdmi_probe_regulators(struct udevice *dev,
* rk_hdmi_of_to_plat() - common of_to_plat implementation
*
* @dev: device
- * @return 0 if OK, -ve if something went wrong
+ * Return: 0 if OK, -ve if something went wrong
*/
int rk_hdmi_of_to_plat(struct udevice *dev);
@@ -68,7 +68,7 @@ int rk_hdmi_of_to_plat(struct udevice *dev);
* 3. initialises the Designware HDMI PHY
*
* @dev: device
- * @return 0 if OK, -ve if something went wrong
+ * Return: 0 if OK, -ve if something went wrong
*/
int rk_hdmi_probe(struct udevice *dev);
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index fe0574870f..bc98ab6875 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -238,7 +238,7 @@ static void rkvop_mode_set(struct udevice *dev,
* @fbbase: Frame buffer address
* @ep_node: Device tree node to process - this is the offset of an endpoint
* node within the VOP's 'port' list.
- * @return 0 if OK, -ve if something went wrong
+ * Return: 0 if OK, -ve if something went wrong
*/
static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node)
{
diff --git a/drivers/video/rockchip/rk_vop.h b/drivers/video/rockchip/rk_vop.h
index 53a79c04b5..0528fb23f5 100644
--- a/drivers/video/rockchip/rk_vop.h
+++ b/drivers/video/rockchip/rk_vop.h
@@ -32,7 +32,7 @@ struct rkvop_driverdata {
* successfully initialised).
*
* @dev: device
- * @return 0 if OK, -ve if something went wrong
+ * Return: 0 if OK, -ve if something went wrong
*/
int rk_vop_probe(struct udevice *dev);
@@ -44,7 +44,7 @@ int rk_vop_probe(struct udevice *dev);
* (32 BPP) x VIDEO_ROCKCHIP_MAX_XRES x VIDEO_ROCKCHIP_MAX_YRES
*
* @dev: device
- * @return 0 (always OK)
+ * Return: 0 (always OK)
*/
int rk_vop_bind(struct udevice *dev);
diff --git a/drivers/video/sunxi/simplefb_common.h b/drivers/video/sunxi/simplefb_common.h
index f4c5e745c6..10292a095a 100644
--- a/drivers/video/sunxi/simplefb_common.h
+++ b/drivers/video/sunxi/simplefb_common.h
@@ -14,7 +14,7 @@
*
* @blob: device tree blob
* @pipeline: display pipeline
- * @return device node offset in blob, or negative values if failed
+ * Return: device node offset in blob, or negative values if failed
*/
int sunxi_simplefb_fdt_match(void *blob, const char *pipeline);
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index d60132eb77..3f9fcd0403 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -262,7 +262,7 @@ static int setup_window(struct disp_ctl_win *win,
* @param blob Device tree blob
* @param priv Driver's private data
* @param default_lcd_base Default address of LCD frame buffer
- * @return 0 if ok, -1 on error (unsupported bits per pixel)
+ * Return: 0 if ok, -1 on error (unsupported bits per pixel)
*/
static int tegra_display_probe(const void *blob, struct tegra_lcd_priv *priv,
void *default_lcd_base)
diff --git a/drivers/video/ti/am335x-fb.c b/drivers/video/ti/am335x-fb.c
index 8b41dac66d..680ea47998 100644
--- a/drivers/video/ti/am335x-fb.c
+++ b/drivers/video/ti/am335x-fb.c
@@ -139,7 +139,7 @@ struct dpll_data {
*
* @dpll_data: struct dpll_data pointer for the DPLL
* @rate: New DPLL clock rate
- * @return rounded rate and the computed m, n and div values in the dpll_data
+ * Return: rounded rate and the computed m, n and div values in the dpll_data
* structure, or -ve error code.
*/
static ulong am335x_dpll_round_rate(struct dpll_data *dd, ulong rate)
@@ -189,7 +189,7 @@ static ulong am335x_dpll_round_rate(struct dpll_data *dd, ulong rate)
*
* @am335x_lcdhw: Base address of the LCD controller registers.
* @rate: New clock rate in Hz.
- * @return new rate, or -ve error code.
+ * Return: new rate, or -ve error code.
*/
static ulong am335x_fb_set_pixel_clk_rate(struct am335x_lcdhw *regs, ulong rate)
{
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index e8600b2def..c8c3fd3549 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -21,7 +21,7 @@
/**
* get_bmp_col_16bpp() - Convert a colour-table entry into a 16bpp pixel value
*
- * @return value to write to the 16bpp frame buffer for this palette entry
+ * Return: value to write to the 16bpp frame buffer for this palette entry
*/
static uint get_bmp_col_16bpp(struct bmp_color_table_entry cte)
{
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index ed7373eac8..69ef736d4c 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -384,7 +384,7 @@ int video_get_option_int(const char *options, const char *name, int def)
* @param t The EDID detailed timing to be converted
* @param mode Returns the converted timing
*
- * @return 0 on success, or a negative errno on error
+ * Return: 0 on success, or a negative errno on error
*/
int video_edid_dtd_to_ctfb_res_modes(struct edid_detailed_timing *t,
struct ctfb_res_modes *mode)