Staging: comedi: Misc code cleanups for checkpatch
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a87e4f5a4a
commit
51b713a684
|
@ -53,9 +53,9 @@
|
||||||
|
|
||||||
#define COMEDI_INITCLEANUP_NOMODULE(x) \
|
#define COMEDI_INITCLEANUP_NOMODULE(x) \
|
||||||
static int __init x ## _init_module(void) \
|
static int __init x ## _init_module(void) \
|
||||||
{return comedi_driver_register(&(x));} \
|
{return comedi_driver_register(&(x)); } \
|
||||||
static void __exit x ## _cleanup_module(void) \
|
static void __exit x ## _cleanup_module(void) \
|
||||||
{comedi_driver_unregister(&(x));} \
|
{comedi_driver_unregister(&(x)); } \
|
||||||
module_init(x ## _init_module); \
|
module_init(x ## _init_module); \
|
||||||
module_exit(x ## _cleanup_module); \
|
module_exit(x ## _cleanup_module); \
|
||||||
|
|
||||||
|
|
|
@ -179,7 +179,7 @@ static comedi_driver driver_icp_multi = {
|
||||||
attach : icp_multi_attach,
|
attach : icp_multi_attach,
|
||||||
detach : icp_multi_detach,
|
detach : icp_multi_detach,
|
||||||
num_names : n_boardtypes,
|
num_names : n_boardtypes,
|
||||||
board_name:&boardtypes[0].name,
|
board_name : &boardtypes[0].name,
|
||||||
offset : sizeof(boardtype),
|
offset : sizeof(boardtype),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -947,7 +947,7 @@ static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it)
|
||||||
n_subdevices++;
|
n_subdevices++;
|
||||||
|
|
||||||
ret = alloc_subdevices(dev, n_subdevices);
|
ret = alloc_subdevices(dev, n_subdevices);
|
||||||
if ( ret < 0 )
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
icp_multi_reset(dev);
|
icp_multi_reset(dev);
|
||||||
|
|
|
@ -246,7 +246,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id,
|
||||||
|
|
||||||
if ((pci_bus < 1) & (pci_slot < 1)) { /* use autodetection */
|
if ((pci_bus < 1) & (pci_slot < 1)) { /* use autodetection */
|
||||||
|
|
||||||
card = find_free_pci_card_by_device(vendor_id,device_id);
|
card = find_free_pci_card_by_device(vendor_id, device_id);
|
||||||
if (card == NULL) {
|
if (card == NULL) {
|
||||||
rt_printk(" - Unused card not found in system!\n");
|
rt_printk(" - Unused card not found in system!\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -268,7 +268,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id,
|
||||||
}
|
}
|
||||||
|
|
||||||
err = pci_card_alloc(card);
|
err = pci_card_alloc(card);
|
||||||
if ( err != 0) {
|
if (err != 0) {
|
||||||
if (err > 0)
|
if (err > 0)
|
||||||
rt_printk(" - Can't allocate card!\n");
|
rt_printk(" - Can't allocate card!\n");
|
||||||
/* else: error already printed. */
|
/* else: error already printed. */
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
|
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
struct mite_struct *mite_devices = NULL;
|
struct mite_struct *mite_devices;
|
||||||
|
|
||||||
#define TOP_OF_PAGE(x) ((x)|(~(PAGE_MASK)))
|
#define TOP_OF_PAGE(x) ((x)|(~(PAGE_MASK)))
|
||||||
|
|
||||||
|
|
|
@ -2155,7 +2155,7 @@ static int rtd_ao_winsn(comedi_device *dev,
|
||||||
/* VERIFY: comedi range and offset conversions */
|
/* VERIFY: comedi range and offset conversions */
|
||||||
|
|
||||||
if ((range > 1) /* bipolar */
|
if ((range > 1) /* bipolar */
|
||||||
&&(data[i] < 2048)) {
|
&& (data[i] < 2048)) {
|
||||||
/* offset and sign extend */
|
/* offset and sign extend */
|
||||||
val = (((int)data[i]) - 2048) << 3;
|
val = (((int)data[i]) - 2048) << 3;
|
||||||
} else { /* unipolor */
|
} else { /* unipolor */
|
||||||
|
|
|
@ -180,7 +180,7 @@ void comedi_rt_pend_wakeup(wait_queue_head_t *q)
|
||||||
|
|
||||||
#ifndef HAVE_RT_REQUEST_IRQ_WITH_ARG
|
#ifndef HAVE_RT_REQUEST_IRQ_WITH_ARG
|
||||||
#define DECLARE_VOID_IRQ(irq) \
|
#define DECLARE_VOID_IRQ(irq) \
|
||||||
static void handle_void_irq_ ## irq (void){ handle_void_irq(irq);}
|
static void handle_void_irq_ ## irq (void){ handle_void_irq(irq); }
|
||||||
|
|
||||||
static void handle_void_irq(int irq)
|
static void handle_void_irq(int irq)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue