Commit 8d026858 authored by Wolfram Sang's avatar Wolfram Sang Committed by Helge Deller
Browse files

fbdev: Move fbdev drivers from strlcpy to strscpy 

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/


Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 144c4673

drivers/video/console/sticore.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static char default_sti_path[21] __read_mostly; 
static int __init sti_setup(char *str)

{

	if (str)

		strlcpy (default_sti_path, str, sizeof (default_sti_path));

		strscpy(default_sti_path, str, sizeof(default_sti_path));

	

	return 1;

}

drivers/video/fbdev/aty/atyfb_base.c

+1 −1
Original line number Diff line number Diff line
@@ -3891,7 +3891,7 @@ static int __init atyfb_setup(char *options) 
			 && (!strncmp(this_opt, "Mach64:", 7))) {

			static unsigned char m64_num;

			static char mach64_str[80];

			strlcpy(mach64_str, this_opt + 7, sizeof(mach64_str));

			strscpy(mach64_str, this_opt + 7, sizeof(mach64_str));

			if (!store_video_par(mach64_str, m64_num)) {

				m64_num++;

				mach64_count = m64_num;

drivers/video/fbdev/aty/radeon_base.c

+1 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ static int radeon_set_fbinfo(struct radeonfb_info *rinfo) 
	info->screen_base = rinfo->fb_base;

	info->screen_size = rinfo->mapped_vram;

	/* Fill fix common fields */

	strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id));

	strscpy(info->fix.id, rinfo->name, sizeof(info->fix.id));

        info->fix.smem_start = rinfo->fb_base_phys;

        info->fix.smem_len = rinfo->video_ram;

        info->fix.type = FB_TYPE_PACKED_PIXELS;

drivers/video/fbdev/bw2.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) 


static void bw2_init_fix(struct fb_info *info, int linebytes)

{

	strlcpy(info->fix.id, "bwtwo", sizeof(info->fix.id));

	strscpy(info->fix.id, "bwtwo", sizeof(info->fix.id));



	info->fix.type = FB_TYPE_PACKED_PIXELS;

	info->fix.visual = FB_VISUAL_MONO01;

drivers/video/fbdev/cirrusfb.c

+1 −1
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info) 
	}



	/* Fill fix common fields */

	strlcpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,

	strscpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,

		sizeof(info->fix.id));



	/* monochrome: only 1 memory plane */