Remove the `inline` function specifiers. Let the compiler figure it out
for itself. `dac_data_bits()` was unused, but it can be used by
`set_dac()` so do so.
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Frank Mori Hess <fmh6jj@xxxxxxxxx>
---
drivers/staging/comedi/drivers/adv_pci1724.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c
index 55d2de3..4649a29 100644
--- a/drivers/staging/comedi/drivers/adv_pci1724.c
+++ b/drivers/staging/comedi/drivers/adv_pci1724.c
@@ -85,23 +85,22 @@ enum dac_control_contents {
DAC_GROUP_SELECT_MASK = 0xf00000
};
-static inline uint32_t dac_data_bits(uint16_t dac_data)
+static uint32_t dac_data_bits(uint16_t dac_data)
{
return dac_data & DAC_DATA_MASK;
}
-static inline uint32_t dac_channel_select_bits(unsigned channel)
+static uint32_t dac_channel_select_bits(unsigned channel)
{
return (channel << 16) & DAC_CHANNEL_SELECT_MASK;
}
-static inline uint32_t dac_group_select_bits(unsigned group)
+static uint32_t dac_group_select_bits(unsigned group)
{
return (1 << (20 + group)) & DAC_GROUP_SELECT_MASK;
}
-static inline uint32_t
-dac_channel_and_group_select_bits(unsigned comedi_channel)
+static uint32_t dac_channel_and_group_select_bits(unsigned comedi_channel)
{
return dac_channel_select_bits(comedi_channel % 8) |
dac_group_select_bits(comedi_channel / 8);
@@ -306,7 +305,7 @@ static int set_dac(struct comedi_device *dev, unsigned mode, unsigned channel,
control_bits = mode;
control_bits |= dac_channel_and_group_select_bits(channel);
- control_bits |= data & DAC_DATA_MASK;
+ control_bits |= dac_data_bits(data);
outl(control_bits, dev->iobase + DAC_CONTROL_REG);
return 0;
}
--
1.8.1.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
