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

Commit 51fadb98 authored by Alison Schofield's avatar Alison Schofield Committed by Jonathan Cameron
Browse files

staging: iio: convert bare unsigned usage to unsigned int 



Use kernel preferred unsigned int declaration style.

Patch created using:
git ls-files drivers/staging/iio | \
xargs ./scripts/checkpatch.pl -f --fix-inplace --types=unspecified_int

Hand edits restored columns in structure definitions.

Signed-off-by: default avatarAlison Schofield <amsfield22@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent e6e45420

drivers/staging/iio/adc/ad7280a.c

+20 −20
Original line number Original line Diff line number Diff line
@@ -155,7 +155,7 @@ static void ad7280_crc8_build_table(unsigned char *crc_tab) 
	}

	}

}

}





static unsigned char ad7280_calc_crc8(unsigned char *crc_tab, unsigned val)

static unsigned char ad7280_calc_crc8(unsigned char *crc_tab, unsigned int val)

{

{

	unsigned char crc;

	unsigned char crc;
@@ -165,7 +165,7 @@ static unsigned char ad7280_calc_crc8(unsigned char *crc_tab, unsigned val) 
	return  crc ^ (val & 0xFF);

	return  crc ^ (val & 0xFF);

}

}





static int ad7280_check_crc(struct ad7280_state *st, unsigned val)

static int ad7280_check_crc(struct ad7280_state *st, unsigned int val)

{

{

	unsigned char crc = ad7280_calc_crc8(st->crc_tab, val >> 10);

	unsigned char crc = ad7280_calc_crc8(st->crc_tab, val >> 10);
@@ -191,7 +191,7 @@ static void ad7280_delay(struct ad7280_state *st) 
		usleep_range(250, 500);

		usleep_range(250, 500);

}

}





static int __ad7280_read32(struct ad7280_state *st, unsigned *val)

static int __ad7280_read32(struct ad7280_state *st, unsigned int *val)

{

{

	int ret;

	int ret;

	struct spi_transfer t = {

	struct spi_transfer t = {
@@ -211,10 +211,10 @@ static int __ad7280_read32(struct ad7280_state *st, unsigned *val) 
	return 0;

	return 0;

}

}





static int ad7280_write(struct ad7280_state *st, unsigned devaddr,

static int ad7280_write(struct ad7280_state *st, unsigned int devaddr,

			unsigned addr, bool all, unsigned val)

			unsigned int addr, bool all, unsigned int val)

{

{

	unsigned reg = devaddr << 27 | addr << 21 |

	unsigned int reg = devaddr << 27 | addr << 21 |

			(val & 0xFF) << 13 | all << 12;

			(val & 0xFF) << 13 | all << 12;





	reg |= ad7280_calc_crc8(st->crc_tab, reg >> 11) << 3 | 0x2;

	reg |= ad7280_calc_crc8(st->crc_tab, reg >> 11) << 3 | 0x2;
@@ -223,11 +223,11 @@ static int ad7280_write(struct ad7280_state *st, unsigned devaddr, 
	return spi_write(st->spi, &st->buf[0], 4);

	return spi_write(st->spi, &st->buf[0], 4);

}

}





static int ad7280_read(struct ad7280_state *st, unsigned devaddr,

static int ad7280_read(struct ad7280_state *st, unsigned int devaddr,

		       unsigned addr)

		       unsigned int addr)

{

{

	int ret;

	int ret;

	unsigned tmp;

	unsigned int tmp;





	/* turns off the read operation on all parts */

	/* turns off the read operation on all parts */

	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_CONTROL_HB, 1,

	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_CONTROL_HB, 1,
@@ -261,11 +261,11 @@ static int ad7280_read(struct ad7280_state *st, unsigned devaddr, 
	return (tmp >> 13) & 0xFF;

	return (tmp >> 13) & 0xFF;

}

}





static int ad7280_read_channel(struct ad7280_state *st, unsigned devaddr,

static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,

			       unsigned addr)

			       unsigned int addr)

{

{

	int ret;

	int ret;

	unsigned tmp;

	unsigned int tmp;





	ret = ad7280_write(st, devaddr, AD7280A_READ, 0, addr << 2);

	ret = ad7280_write(st, devaddr, AD7280A_READ, 0, addr << 2);

	if (ret)

	if (ret)
@@ -299,11 +299,11 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned devaddr, 
	return (tmp >> 11) & 0xFFF;

	return (tmp >> 11) & 0xFFF;

}

}





static int ad7280_read_all_channels(struct ad7280_state *st, unsigned cnt,

static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,

				    unsigned *array)

				    unsigned int *array)

{

{

	int i, ret;

	int i, ret;

	unsigned tmp, sum = 0;

	unsigned int tmp, sum = 0;





	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_READ, 1,

	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_READ, 1,

			   AD7280A_CELL_VOLTAGE_1 << 2);

			   AD7280A_CELL_VOLTAGE_1 << 2);
@@ -338,7 +338,7 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned cnt, 




static int ad7280_chain_setup(struct ad7280_state *st)

static int ad7280_chain_setup(struct ad7280_state *st)

{

{

	unsigned val, n;

	unsigned int val, n;

	int ret;

	int ret;





	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_CONTROL_LB, 1,

	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_CONTROL_LB, 1,
@@ -401,7 +401,7 @@ static ssize_t ad7280_store_balance_sw(struct device *dev, 
	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	bool readin;

	bool readin;

	int ret;

	int ret;

	unsigned devaddr, ch;

	unsigned int devaddr, ch;





	ret = strtobool(buf, &readin);

	ret = strtobool(buf, &readin);

	if (ret)

	if (ret)
@@ -431,7 +431,7 @@ static ssize_t ad7280_show_balance_timer(struct device *dev, 
	struct ad7280_state *st = iio_priv(indio_dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	int ret;

	int ret;

	unsigned msecs;

	unsigned int msecs;





	mutex_lock(&indio_dev->mlock);

	mutex_lock(&indio_dev->mlock);

	ret = ad7280_read(st, this_attr->address >> 8,

	ret = ad7280_read(st, this_attr->address >> 8,
@@ -602,7 +602,7 @@ static ssize_t ad7280_read_channel_config(struct device *dev, 
	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	unsigned val;

	unsigned int val;





	switch ((u32)this_attr->address) {

	switch ((u32)this_attr->address) {

	case AD7280A_CELL_OVERVOLTAGE:

	case AD7280A_CELL_OVERVOLTAGE:
@@ -683,7 +683,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) 
{

{

	struct iio_dev *indio_dev = private;

	struct iio_dev *indio_dev = private;

	struct ad7280_state *st = iio_priv(indio_dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	unsigned *channels;

	unsigned int *channels;

	int i, ret;

	int i, ret;





	channels = kcalloc(st->scan_cnt, sizeof(*channels), GFP_KERNEL);

	channels = kcalloc(st->scan_cnt, sizeof(*channels), GFP_KERNEL);

drivers/staging/iio/adc/ad7280a.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -29,9 +29,9 @@ 
#define AD7280A_ALERT_REMOVE_AUX4_AUX5		BIT(1)

#define AD7280A_ALERT_REMOVE_AUX4_AUX5		BIT(1)





struct ad7280_platform_data {

struct ad7280_platform_data {

	unsigned acquisition_time;

	unsigned int		acquisition_time;

	unsigned conversion_averaging;

	unsigned int		conversion_averaging;

	unsigned chain_last_alert_ignore;

	unsigned int		chain_last_alert_ignore;

	bool			thermistor_term_en;

	bool			thermistor_term_en;

};

};

drivers/staging/iio/adc/ad7606.h

+14 −14
Original line number Original line Diff line number Diff line
@@ -28,16 +28,16 @@ 
 */

 */





struct ad7606_platform_data {

struct ad7606_platform_data {

	unsigned			default_os;

	unsigned int			default_os;

	unsigned			default_range;

	unsigned int			default_range;

	unsigned			gpio_convst;

	unsigned int			gpio_convst;

	unsigned			gpio_reset;

	unsigned int			gpio_reset;

	unsigned			gpio_range;

	unsigned int			gpio_range;

	unsigned			gpio_os0;

	unsigned int			gpio_os0;

	unsigned			gpio_os1;

	unsigned int			gpio_os1;

	unsigned			gpio_os2;

	unsigned int			gpio_os2;

	unsigned			gpio_frstdata;

	unsigned int			gpio_frstdata;

	unsigned			gpio_stby;

	unsigned int			gpio_stby;

};

};





/**

/**
@@ -52,7 +52,7 @@ struct ad7606_chip_info { 
	const char			*name;

	const char			*name;

	u16				int_vref_mv;

	u16				int_vref_mv;

	const struct iio_chan_spec	*channels;

	const struct iio_chan_spec	*channels;

	unsigned			num_channels;

	unsigned int			num_channels;

};

};





/**

/**
@@ -67,8 +67,8 @@ struct ad7606_state { 
	struct work_struct		poll_work;

	struct work_struct		poll_work;

	wait_queue_head_t		wq_data_avail;

	wait_queue_head_t		wq_data_avail;

	const struct ad7606_bus_ops	*bops;

	const struct ad7606_bus_ops	*bops;

	unsigned			range;

	unsigned int			range;

	unsigned			oversampling;

	unsigned int			oversampling;

	bool				done;

	bool				done;

	void __iomem			*base_address;

	void __iomem			*base_address;
@@ -86,7 +86,7 @@ struct ad7606_bus_ops { 
};

};





struct iio_dev *ad7606_probe(struct device *dev, int irq,

struct iio_dev *ad7606_probe(struct device *dev, int irq,

			      void __iomem *base_address, unsigned id,

			      void __iomem *base_address, unsigned int id,

			      const struct ad7606_bus_ops *bops);

			      const struct ad7606_bus_ops *bops);

int ad7606_remove(struct iio_dev *indio_dev, int irq);

int ad7606_remove(struct iio_dev *indio_dev, int irq);

int ad7606_reset(struct ad7606_state *st);

int ad7606_reset(struct ad7606_state *st);

drivers/staging/iio/adc/ad7606_core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ int ad7606_reset(struct ad7606_state *st) 
	return -ENODEV;

	return -ENODEV;

}

}





static int ad7606_scan_direct(struct iio_dev *indio_dev, unsigned ch)

static int ad7606_scan_direct(struct iio_dev *indio_dev, unsigned int ch)

{

{

	struct ad7606_state *st = iio_priv(indio_dev);

	struct ad7606_state *st = iio_priv(indio_dev);

	int ret;

	int ret;
@@ -155,7 +155,7 @@ static ssize_t ad7606_show_oversampling_ratio(struct device *dev, 
	return sprintf(buf, "%u\n", st->oversampling);

	return sprintf(buf, "%u\n", st->oversampling);

}

}





static int ad7606_oversampling_get_index(unsigned val)

static int ad7606_oversampling_get_index(unsigned int val)

{

{

	unsigned char supported[] = {0, 2, 4, 8, 16, 32, 64};

	unsigned char supported[] = {0, 2, 4, 8, 16, 32, 64};

	int i;

	int i;
@@ -446,7 +446,7 @@ static const struct iio_info ad7606_info_range = { 




struct iio_dev *ad7606_probe(struct device *dev, int irq,

struct iio_dev *ad7606_probe(struct device *dev, int irq,

			     void __iomem *base_address,

			     void __iomem *base_address,

			     unsigned id,

			     unsigned int id,

			     const struct ad7606_bus_ops *bops)

			     const struct ad7606_bus_ops *bops)

{

{

	struct ad7606_platform_data *pdata = dev->platform_data;

	struct ad7606_platform_data *pdata = dev->platform_data;

drivers/staging/iio/adc/ad7780.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ static int ad7780_set_mode(struct ad_sigma_delta *sigma_delta, 
			   enum ad_sigma_delta_mode mode)

			   enum ad_sigma_delta_mode mode)

{

{

	struct ad7780_state *st = ad_sigma_delta_to_ad7780(sigma_delta);

	struct ad7780_state *st = ad_sigma_delta_to_ad7780(sigma_delta);

	unsigned val;

	unsigned int val;





	switch (mode) {

	switch (mode) {

	case AD_SD_MODE_SINGLE:

	case AD_SD_MODE_SINGLE: