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

Commit c5665dfb authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pci230: convert CLK_CONFIG() macro to function 



Convert the `CLK_CONFIG(chan, src)` macro to a static function
`pci230_clk_config(chan, src)`.  This is consistent with an earlier
change to convert `GAT_CONFIG(chan, src)` to a static function.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 112d55e5

drivers/staging/comedi/drivers/amplc_pci230.c

+6 −3
Original line number Diff line number Diff line
@@ -376,8 +376,11 @@ 
#define CLK_1KHZ	5	/* internal 1 kHz clock */

#define CLK_OUTNM1	6	/* output of channel-1 modulo total */

#define CLK_EXT		7	/* external clock */

/* Macro to construct clock input configuration register value. */

#define CLK_CONFIG(chan, src)	((((chan) & 3) << 3) | ((src) & 7))



static unsigned int pci230_clk_config(unsigned int chan, unsigned int src)

{

	return ((chan & 3) << 3) | (src & 7);

}



/*

 * Counter/timer gate input configuration sources.
@@ -697,7 +700,7 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct, 
	/* Determine clock source and count. */

	clk_src = pci230_choose_clk_count(ns, &count, flags);

	/* Program clock source. */

	outb(CLK_CONFIG(ct, clk_src), dev->iobase + PCI230_ZCLK_SCE);

	outb(pci230_clk_config(ct, clk_src), dev->iobase + PCI230_ZCLK_SCE);

	/* Set initial count. */

	if (count >= 65536)

		count = 0;