Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34206439 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx88: reorder inline to prevent a gcc warning 



drivers/media/pci/cx88/cx88.h:97:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88.h:103:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88-core.c:649:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88-core.c:654:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88-core.c:659:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88-core.c:664:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88-core.c:684:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
drivers/media/pci/cx88/cx88-core.c:695:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e6ea0b91

drivers/media/pci/cx88/cx88-core.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -646,22 +646,22 @@ int cx88_reset(struct cx88_core *core) 




/* ------------------------------------------------------------------ */

/* ------------------------------------------------------------------ */





static unsigned int inline norm_swidth(v4l2_std_id norm)

static inline unsigned int norm_swidth(v4l2_std_id norm)

{

{

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 754 : 922;

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 754 : 922;

}

}





static unsigned int inline norm_hdelay(v4l2_std_id norm)

static inline unsigned int norm_hdelay(v4l2_std_id norm)

{

{

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 135 : 186;

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 135 : 186;

}

}





static unsigned int inline norm_vdelay(v4l2_std_id norm)

static inline unsigned int norm_vdelay(v4l2_std_id norm)

{

{

	return (norm & V4L2_STD_625_50) ? 0x24 : 0x18;

	return (norm & V4L2_STD_625_50) ? 0x24 : 0x18;

}

}





static unsigned int inline norm_fsc8(v4l2_std_id norm)

static inline unsigned int norm_fsc8(v4l2_std_id norm)

{

{

	if (norm & V4L2_STD_PAL_M)

	if (norm & V4L2_STD_PAL_M)

		return 28604892;      // 3.575611 MHz

		return 28604892;      // 3.575611 MHz
@@ -681,7 +681,7 @@ static unsigned int inline norm_fsc8(v4l2_std_id norm) 
	return 35468950;      // 4.43361875 MHz +/- 5 Hz

	return 35468950;      // 4.43361875 MHz +/- 5 Hz

}

}





static unsigned int inline norm_htotal(v4l2_std_id norm)

static inline unsigned int norm_htotal(v4l2_std_id norm)

{

{





	unsigned int fsc4=norm_fsc8(norm)/2;

	unsigned int fsc4=norm_fsc8(norm)/2;
@@ -692,7 +692,7 @@ static unsigned int inline norm_htotal(v4l2_std_id norm) 
				((fsc4+262)/525*1001+15000)/30000;

				((fsc4+262)/525*1001+15000)/30000;

}

}





static unsigned int inline norm_vbipack(v4l2_std_id norm)

static inline unsigned int norm_vbipack(v4l2_std_id norm)

{

{

	return (norm & V4L2_STD_625_50) ? 511 : 400;

	return (norm & V4L2_STD_625_50) ? 511 : 400;

}

}

drivers/media/pci/cx88/cx88.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -94,13 +94,13 @@ enum cx8802_board_access { 
/* ----------------------------------------------------------- */

/* ----------------------------------------------------------- */

/* tv norms                                                    */

/* tv norms                                                    */





static unsigned int inline norm_maxw(v4l2_std_id norm)

static inline unsigned int norm_maxw(v4l2_std_id norm)

{

{

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;

}

}









static unsigned int inline norm_maxh(v4l2_std_id norm)

static inline unsigned int norm_maxh(v4l2_std_id norm)

{

{

	return (norm & V4L2_STD_625_50) ? 576 : 480;

	return (norm & V4L2_STD_625_50) ? 576 : 480;

}

}