Skip to content

Commit

Permalink
Staging: comedi: Misc code cleanups for checkpatch
Browse files Browse the repository at this point in the history
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent a87e4f5 commit 51b713a
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@

#define COMEDI_INITCLEANUP_NOMODULE(x) \
static int __init x ## _init_module(void) \
{return comedi_driver_register(&(x));} \
{return comedi_driver_register(&(x)); } \
static void __exit x ## _cleanup_module(void) \
{comedi_driver_unregister(&(x));} \
{comedi_driver_unregister(&(x)); } \
module_init(x ## _init_module); \
module_exit(x ## _cleanup_module); \

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/icp_multi.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ static comedi_driver driver_icp_multi = {
attach : icp_multi_attach,
detach : icp_multi_detach,
num_names : n_boardtypes,
board_name:&boardtypes[0].name,
board_name : &boardtypes[0].name,
offset : sizeof(boardtype),
};

Expand Down Expand Up @@ -947,7 +947,7 @@ static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it)
n_subdevices++;

ret = alloc_subdevices(dev, n_subdevices);
if ( ret < 0 )
if (ret < 0)
return ret;

icp_multi_reset(dev);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/icp_multi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

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) {
rt_printk(" - Unused card not found in system!\n");
return NULL;
Expand All @@ -268,7 +268,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id,
}

err = pci_card_alloc(card);
if ( err != 0) {
if (err != 0) {
if (err > 0)
rt_printk(" - Can't allocate card!\n");
/* else: error already printed. */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/mite.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

MODULE_LICENSE("GPL");

struct mite_struct *mite_devices = NULL;
struct mite_struct *mite_devices;

#define TOP_OF_PAGE(x) ((x)|(~(PAGE_MASK)))

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,7 @@ static int rtd_ao_winsn(comedi_device *dev,
/* VERIFY: comedi range and offset conversions */

if ((range > 1) /* bipolar */
&&(data[i] < 2048)) {
&& (data[i] < 2048)) {
/* offset and sign extend */
val = (((int)data[i]) - 2048) << 3;
} else { /* unipolor */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/rt.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ void comedi_rt_pend_wakeup(wait_queue_head_t *q)

#ifndef HAVE_RT_REQUEST_IRQ_WITH_ARG
#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)
{
Expand Down

0 comments on commit 51b713a

Please sign in to comment.