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

Commit f7ede00d authored by Nikita Eshkeev's avatar Nikita Eshkeev Committed by Greg Kroah-Hartman
Browse files

staging:comedi:Use unsigned int instead of unsigned 



This patch fixed the checkpatch.pl warning:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

Signed-off-by: default avatarNikita Eshkeev <kastolom@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1aee5dd

drivers/staging/comedi/comedi.h

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ struct comedi_subdinfo { 
	unsigned int flags;

	unsigned int range_type;

	unsigned int settling_time_0;

	unsigned insn_bits_support;

	unsigned int insn_bits_support;

	unsigned int unused[8];

};

drivers/staging/comedi/drivers/comedi_bond.c

+5 −5
Original line number Diff line number Diff line
@@ -55,16 +55,16 @@ 


struct bonded_device {

	struct comedi_device *dev;

	unsigned minor;

	unsigned subdev;

	unsigned nchans;

	unsigned int minor;

	unsigned int subdev;

	unsigned int nchans;

};



struct comedi_bond_private {

	char name[256];

	struct bonded_device **devs;

	unsigned ndevs;

	unsigned nchans;

	unsigned int ndevs;

	unsigned int nchans;

};



static int bonding_dio_insn_bits(struct comedi_device *dev,

drivers/staging/comedi/drivers/das800.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ struct das800_private { 
};



static void das800_ind_write(struct comedi_device *dev,

			     unsigned val, unsigned reg)

			     unsigned int val, unsigned int reg)

{

	/*

	 * Select dev->iobase + 2 to be desired register
@@ -228,7 +228,7 @@ static void das800_ind_write(struct comedi_device *dev, 
	outb(val, dev->iobase + 2);

}



static unsigned das800_ind_read(struct comedi_device *dev, unsigned reg)

static unsigned int das800_ind_read(struct comedi_device *dev, unsigned int reg)

{

	/*

	 * Select dev->iobase + 7 to be desired register

drivers/staging/comedi/drivers/ni_65xx.c

+9 −9
Original line number Diff line number Diff line
@@ -151,10 +151,10 @@ enum ni_65xx_boardid { 


struct ni_65xx_board {

	const char *name;

	unsigned num_dio_ports;

	unsigned num_di_ports;

	unsigned num_do_ports;

	unsigned legacy_invert:1;

	unsigned int num_dio_ports;

	unsigned int num_di_ports;

	unsigned int num_do_ports;

	unsigned int legacy_invert:1;

};



static const struct ni_65xx_board ni_65xx_boards[] = {
@@ -360,7 +360,7 @@ static int ni_65xx_dio_insn_config(struct comedi_device *dev, 
	unsigned long base_port = (unsigned long)s->private;

	unsigned int chan = CR_CHAN(insn->chanspec);

	unsigned int chan_mask = NI_65XX_CHAN_TO_MASK(chan);

	unsigned port = base_port + NI_65XX_CHAN_TO_PORT(chan);

	unsigned int port = base_port + NI_65XX_CHAN_TO_PORT(chan);

	unsigned int interval;

	unsigned int val;
@@ -428,14 +428,14 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev, 
	unsigned long base_port = (unsigned long)s->private;

	unsigned int base_chan = CR_CHAN(insn->chanspec);

	int last_port_offset = NI_65XX_CHAN_TO_PORT(s->n_chan - 1);

	unsigned read_bits = 0;

	unsigned int read_bits = 0;

	int port_offset;



	for (port_offset = NI_65XX_CHAN_TO_PORT(base_chan);

	     port_offset <= last_port_offset; port_offset++) {

		unsigned port = base_port + port_offset;

		unsigned int port = base_port + port_offset;

		int base_port_channel = NI_65XX_PORT_TO_CHAN(port_offset);

		unsigned port_mask, port_data, bits;

		unsigned int port_mask, port_data, bits;

		int bitshift = base_port_channel - base_chan;



		if (bitshift >= 32)
@@ -640,7 +640,7 @@ static int ni_65xx_auto_attach(struct comedi_device *dev, 
	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	const struct ni_65xx_board *board = NULL;

	struct comedi_subdevice *s;

	unsigned i;

	unsigned int i;

	int ret;



	if (context < ARRAY_SIZE(ni_65xx_boards))

drivers/staging/comedi/drivers/ni_pcidio.c

+2 −2
Original line number Diff line number Diff line
@@ -170,12 +170,12 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org 
#define DMA_Line_Control_Group1		76

#define DMA_Line_Control_Group2		108

/* channel zero is none */

static inline unsigned primary_DMAChannel_bits(unsigned channel)

static inline unsigned int primary_DMAChannel_bits(unsigned int channel)

{

	return channel & 0x3;

}



static inline unsigned secondary_DMAChannel_bits(unsigned channel)

static inline unsigned int secondary_DMAChannel_bits(unsigned int channel)

{

	return (channel << 2) & 0xc;

}