renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

Staging: comedi: Use function setup_timer for combining initialization

Browse Source 
The function setup_timer combines the initialization of a timer with the
initialization of the timer's function and data fields.

So, this patch combines the multiline code for timer initialization using the function
setup_timer. This issue is identified via coccinelle script.

@@
expression E1, E2, E3;
type T;
@@
- init_timer(&E1);
...
(
- E1.function = E2;
...
- E1.data = (T)E3;
+ setup_timer(&E1, E2, (T)E3);
|
- E1.data = (T)E3;
...
- E1.function = E2;
+ setup_timer(&E1, E2, (T)E3);
|
- E1.function = E2;
+ setup_timer(&E1, E2, 0);
)

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Somya Anand 2015-03-11 17:02:13 +05:30 committed by Greg Kroah-Hartman
parent 6946edd07a
commit 81906c357a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/comedi/drivers/das16.c
View File

@ -935,9 +935,8 @@ static void das16_alloc_dma(struct comedi_device *dev, unsigned int dma_chan)
devpriv->dma = comedi_isadma_alloc(dev, 2, dma_chan, dma_chan, devpriv->dma = comedi_isadma_alloc(dev, 2, dma_chan, dma_chan,
DAS16_DMA_SIZE, COMEDI_ISADMA_READ); DAS16_DMA_SIZE, COMEDI_ISADMA_READ);
if (devpriv->dma) { if (devpriv->dma) {
init_timer(&devpriv->timer); setup_timer(&devpriv->timer, das16_timer_interrupt,
devpriv->timer.function = das16_timer_interrupt; (unsigned long)dev);
devpriv->timer.data = (unsigned long)dev;
} }
} }

5
drivers/staging/comedi/drivers/jr3_pci.c
View File

@ -706,8 +706,6 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
if (!devpriv) if (!devpriv)
return -ENOMEM; return -ENOMEM;
init_timer(&devpriv->timer);
ret = comedi_pci_enable(dev); ret = comedi_pci_enable(dev);
if (ret) if (ret)
return ret; return ret;
@ -775,8 +773,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
spriv->next_time_max = jiffies + msecs_to_jiffies(2000); spriv->next_time_max = jiffies + msecs_to_jiffies(2000);
} }
devpriv->timer.data = (unsigned long)dev; setup_timer(&devpriv->timer, jr3_pci_poll_dev, (unsigned long)dev);
devpriv->timer.function = jr3_pci_poll_dev;
devpriv->timer.expires = jiffies + msecs_to_jiffies(1000); devpriv->timer.expires = jiffies + msecs_to_jiffies(1000);
add_timer(&devpriv->timer); add_timer(&devpriv->timer);