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

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

staging: comedi: amplc_pci230: remove 'inline' 



Some functions in "amplc_pci230.c" are declared `inline`.  Remove the
`inline` specifiers and let the compiler do what it wants with them.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66a462ba

drivers/staging/comedi/drivers/amplc_pci230.c

+11 −13
Original line number Original line Diff line number Diff line
@@ -573,7 +573,7 @@ static unsigned short pci230_ai_read(struct comedi_device *dev) 
	return data;

	return data;

}

}





static inline unsigned short pci230_ao_mangle_datum(struct comedi_device *dev,

static unsigned short pci230_ao_mangle_datum(struct comedi_device *dev,

					     unsigned short datum)

					     unsigned short datum)

{

{

	const struct pci230_board *thisboard = comedi_board(dev);

	const struct pci230_board *thisboard = comedi_board(dev);
@@ -593,9 +593,8 @@ static inline unsigned short pci230_ao_mangle_datum(struct comedi_device *dev, 
	return datum;

	return datum;

}

}





static inline void pci230_ao_write_nofifo(struct comedi_device *dev,

static void pci230_ao_write_nofifo(struct comedi_device *dev,

					  unsigned short datum,

				   unsigned short datum, unsigned int chan)

					  unsigned int chan)

{

{

	struct pci230_private *devpriv = dev->private;

	struct pci230_private *devpriv = dev->private;
@@ -604,7 +603,7 @@ static inline void pci230_ao_write_nofifo(struct comedi_device *dev, 
	     devpriv->daqio + ((chan == 0) ? PCI230_DACOUT1 : PCI230_DACOUT2));

	     devpriv->daqio + ((chan == 0) ? PCI230_DACOUT1 : PCI230_DACOUT2));

}

}





static inline void pci230_ao_write_fifo(struct comedi_device *dev,

static void pci230_ao_write_fifo(struct comedi_device *dev,

				 unsigned short datum, unsigned int chan)

				 unsigned short datum, unsigned int chan)

{

{

	struct pci230_private *devpriv = dev->private;

	struct pci230_private *devpriv = dev->private;
@@ -650,7 +649,7 @@ static int get_resources(struct comedi_device *dev, unsigned int res_mask, 
	return ok;

	return ok;

}

}





static inline int get_one_resource(struct comedi_device *dev,

static int get_one_resource(struct comedi_device *dev,

			    unsigned int resource, unsigned char owner)

			    unsigned int resource, unsigned char owner)

{

{

	return get_resources(dev, 1U << resource, owner);

	return get_resources(dev, 1U << resource, owner);
@@ -675,14 +674,13 @@ static void put_resources(struct comedi_device *dev, unsigned int res_mask, 
	spin_unlock_irqrestore(&devpriv->res_spinlock, irqflags);

	spin_unlock_irqrestore(&devpriv->res_spinlock, irqflags);

}

}





static inline void put_one_resource(struct comedi_device *dev,

static void put_one_resource(struct comedi_device *dev,

			     unsigned int resource, unsigned char owner)

			     unsigned int resource, unsigned char owner)

{

{

	put_resources(dev, 1U << resource, owner);

	put_resources(dev, 1U << resource, owner);

}

}





static inline void put_all_resources(struct comedi_device *dev,

static void put_all_resources(struct comedi_device *dev, unsigned char owner)

				     unsigned char owner)

{

{

	put_resources(dev, (1U << NUM_RESOURCES) - 1, owner);

	put_resources(dev, (1U << NUM_RESOURCES) - 1, owner);

}

}