AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-14 18:06:48 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: iio: adc: use kernel types u32 and u64

Browse Source 
Convert uint32_t to u32 and uint64_t to u64 in order to
follow the kernel best practice

Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ioana Ciornei 2015-10-14 21:14:12 +03:00 committed by Greg Kroah-Hartman
parent 4a737ec350
commit 0e4f007500
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/iio/adc/mxs-lradc.c
View File

@ -108,12 +108,12 @@ static const char * const mx28_lradc_irq_names[] = {
struct mxs_lradc_of_config { struct mxs_lradc_of_config {
const int irq_count; const int irq_count;
const char * const *irq_name; const char * const *irq_name;
const uint32_t *vref_mv; const u32 *vref_mv;
}; };
#define VREF_MV_BASE 1850 #define VREF_MV_BASE 1850
static const uint32_t mx23_vref_mv[LRADC_MAX_TOTAL_CHANS] = { static const u32 mx23_vref_mv[LRADC_MAX_TOTAL_CHANS] = {
VREF_MV_BASE, /* CH0 */ VREF_MV_BASE, /* CH0 */
VREF_MV_BASE, /* CH1 */ VREF_MV_BASE, /* CH1 */
VREF_MV_BASE, /* CH2 */ VREF_MV_BASE, /* CH2 */
@ -132,7 +132,7 @@ static const uint32_t mx23_vref_mv[LRADC_MAX_TOTAL_CHANS] = {
VREF_MV_BASE * 4, /* CH15 VDD5V */ VREF_MV_BASE * 4, /* CH15 VDD5V */
}; };
static const uint32_t mx28_vref_mv[LRADC_MAX_TOTAL_CHANS] = { static const u32 mx28_vref_mv[LRADC_MAX_TOTAL_CHANS] = {
VREF_MV_BASE, /* CH0 */ VREF_MV_BASE, /* CH0 */
VREF_MV_BASE, /* CH1 */ VREF_MV_BASE, /* CH1 */
VREF_MV_BASE, /* CH2 */ VREF_MV_BASE, /* CH2 */
@ -198,14 +198,14 @@ struct mxs_lradc {
struct clk *clk; struct clk *clk;
uint32_t *buffer; u32 *buffer;
struct iio_trigger *trig; struct iio_trigger *trig;
struct mutex lock; struct mutex lock;
struct completion completion; struct completion completion;
const uint32_t *vref_mv; const u32 *vref_mv;
struct mxs_lradc_scale scale_avail[LRADC_MAX_TOTAL_CHANS][2]; struct mxs_lradc_scale scale_avail[LRADC_MAX_TOTAL_CHANS][2];
unsigned long is_divided; unsigned long is_divided;
@ -1138,8 +1138,8 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data)
struct iio_dev *iio = data; struct iio_dev *iio = data;
struct mxs_lradc *lradc = iio_priv(iio); struct mxs_lradc *lradc = iio_priv(iio);
unsigned long reg = readl(lradc->base + LRADC_CTRL1); unsigned long reg = readl(lradc->base + LRADC_CTRL1);
uint32_t clr_irq = mxs_lradc_irq_mask(lradc); u32 clr_irq = mxs_lradc_irq_mask(lradc);
const uint32_t ts_irq_mask = const u32 ts_irq_mask =
LRADC_CTRL1_TOUCH_DETECT_IRQ | LRADC_CTRL1_TOUCH_DETECT_IRQ |
LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL1) | LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL1) |
LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2); LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2);
@ -1175,7 +1175,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *iio = pf->indio_dev; struct iio_dev *iio = pf->indio_dev;
struct mxs_lradc *lradc = iio_priv(iio); struct mxs_lradc *lradc = iio_priv(iio);
const uint32_t chan_value = LRADC_CH_ACCUMULATE | const u32 chan_value = LRADC_CH_ACCUMULATE |
((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
unsigned int i, j = 0; unsigned int i, j = 0;
@ -1198,7 +1198,7 @@ static int mxs_lradc_configure_trigger(struct iio_trigger *trig, bool state)
{ {
struct iio_dev *iio = iio_trigger_get_drvdata(trig); struct iio_dev *iio = iio_trigger_get_drvdata(trig);
struct mxs_lradc *lradc = iio_priv(iio); struct mxs_lradc *lradc = iio_priv(iio);
const uint32_t st = state ? STMP_OFFSET_REG_SET : STMP_OFFSET_REG_CLR; const u32 st = state ? STMP_OFFSET_REG_SET : STMP_OFFSET_REG_CLR;
mxs_lradc_reg_wrt(lradc, LRADC_DELAY_KICK, LRADC_DELAY(0) + st); mxs_lradc_reg_wrt(lradc, LRADC_DELAY_KICK, LRADC_DELAY(0) + st);
@ -1248,10 +1248,10 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
struct mxs_lradc *lradc = iio_priv(iio); struct mxs_lradc *lradc = iio_priv(iio);
int ret = 0, chan, ofs = 0; int ret = 0, chan, ofs = 0;
unsigned long enable = 0; unsigned long enable = 0;
uint32_t ctrl4_set = 0; u32 ctrl4_set = 0;
uint32_t ctrl4_clr = 0; u32 ctrl4_clr = 0;
uint32_t ctrl1_irq = 0; u32 ctrl1_irq = 0;
const uint32_t chan_value = LRADC_CH_ACCUMULATE | const u32 chan_value = LRADC_CH_ACCUMULATE |
((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
const int len = bitmap_weight(iio->active_scan_mask, const int len = bitmap_weight(iio->active_scan_mask,
LRADC_MAX_TOTAL_CHANS); LRADC_MAX_TOTAL_CHANS);
@ -1456,7 +1456,7 @@ static const struct iio_chan_spec mx28_lradc_chan_spec[] = {
static int mxs_lradc_hw_init(struct mxs_lradc *lradc) static int mxs_lradc_hw_init(struct mxs_lradc *lradc)
{ {
/* The ADC always uses DELAY CHANNEL 0. */ /* The ADC always uses DELAY CHANNEL 0. */
const uint32_t adc_cfg = const u32 adc_cfg =
(1 << (LRADC_DELAY_TRIGGER_DELAYS_OFFSET + 0)) | (1 << (LRADC_DELAY_TRIGGER_DELAYS_OFFSET + 0)) |
(LRADC_DELAY_TIMER_PER << LRADC_DELAY_DELAY_OFFSET); (LRADC_DELAY_TIMER_PER << LRADC_DELAY_DELAY_OFFSET);
@ -1583,7 +1583,7 @@ static int mxs_lradc_probe(struct platform_device *pdev)
struct resource *iores; struct resource *iores;
int ret = 0, touch_ret; int ret = 0, touch_ret;
int i, s; int i, s;
uint64_t scale_uv; u64 scale_uv;
/* Allocate the IIO device. */ /* Allocate the IIO device. */
iio = devm_iio_device_alloc(dev, sizeof(*lradc)); iio = devm_iio_device_alloc(dev, sizeof(*lradc));