Skip to content

L
linux
Commit a9435326 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: comedi: hwdrv_apci1500.c: sparse static cleanups 

Mark a bunch of variables and functions as static.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2179b4c8
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 39 deletions
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
View file @ a9435326
...@@ -47,16 +47,16 @@ You should also find the complete GPL in the COPYING file accompanying this sour ...@@ -47,16 +47,16 @@ You should also find the complete GPL in the COPYING file accompanying this sour
*/ */
#include "hwdrv_apci1500.h" #include "hwdrv_apci1500.h"
int i_TimerCounter1Init = 0; static int i_TimerCounter1Init = 0;
int i_TimerCounter2Init = 0; static int i_TimerCounter2Init = 0;
int i_WatchdogCounter3Init = 0; static int i_WatchdogCounter3Init = 0;
int i_Event1Status = 0, i_Event2Status = 0; static int i_Event1Status = 0, i_Event2Status = 0;
int i_TimerCounterWatchdogInterrupt = 0; static int i_TimerCounterWatchdogInterrupt = 0;
int i_Logic = 0, i_CounterLogic = 0; static int i_Logic = 0, i_CounterLogic = 0;
int i_InterruptMask = 0; static int i_InterruptMask = 0;
int i_InputChannel = 0; static int i_InputChannel = 0;
int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = static int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = 0,
0, i_WatchdogCounter3Enabled = 0; i_WatchdogCounter3Enabled = 0;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -136,9 +136,10 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = ...@@ -136,9 +136,10 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled =
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0; int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0;
int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0; int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0;
...@@ -519,8 +520,10 @@ int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, ...@@ -519,8 +520,10 @@ int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, struct comedi_subdevice *s, static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
int i_Event1InterruptStatus = 0, i_Event2InterruptStatus = int i_Event1InterruptStatus = 0, i_Event2InterruptStatus =
0, i_RegValue; 0, i_RegValue;
...@@ -784,8 +787,10 @@ int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, struct comedi_subd ...@@ -784,8 +787,10 @@ int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, struct comedi_subd
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice *s, static int i_APCI1500_Initialisation(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
int i_DummyRead = 0; int i_DummyRead = 0;
/******************/ /******************/
...@@ -956,9 +961,10 @@ int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice ...@@ -956,9 +961,10 @@ int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
unsigned int ui_PortValue = data[1]; unsigned int ui_PortValue = data[1];
unsigned int ui_Mask = 0; unsigned int ui_Mask = 0;
...@@ -1040,8 +1046,10 @@ int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub ...@@ -1040,8 +1046,10 @@ int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
devpriv->b_OutputMemoryStatus = data[0]; devpriv->b_OutputMemoryStatus = data[0];
return insn->n; return insn->n;
...@@ -1066,9 +1074,10 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, ...@@ -1066,9 +1074,10 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
static unsigned int ui_Temp = 0; static unsigned int ui_Temp = 0;
unsigned int ui_Temp1; unsigned int ui_Temp1;
...@@ -1260,9 +1269,10 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde ...@@ -1260,9 +1269,10 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
int i_TimerCounterMode, i_MasterConfiguration; int i_TimerCounterMode, i_MasterConfiguration;
...@@ -1860,8 +1870,10 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, ...@@ -1860,8 +1870,10 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
int i_CommandAndStatusValue; int i_CommandAndStatusValue;
...@@ -2181,9 +2193,10 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, ...@@ -2181,9 +2193,10 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
int i_CommandAndStatusValue; int i_CommandAndStatusValue;
switch (data[0]) { switch (data[0]) {
...@@ -2370,8 +2383,10 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev, ...@@ -2370,8 +2383,10 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdevice *s, static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
data[0] = i_InterruptMask; data[0] = i_InterruptMask;
data[1] = i_InputChannel; data[1] = i_InputChannel;
...@@ -2401,8 +2416,10 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdev ...@@ -2401,8 +2416,10 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdev
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev, struct comedi_subdevice *s, static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{ {
unsigned int ui_Status; unsigned int ui_Status;
int i_RegValue; int i_RegValue;
...@@ -2821,8 +2838,7 @@ static void v_APCI1500_Interrupt(int irq, void *d) ...@@ -2821,8 +2838,7 @@ static void v_APCI1500_Interrupt(int irq, void *d)
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_APCI1500_Reset(struct comedi_device *dev)
int i_APCI1500_Reset(struct comedi_device *dev)
{ {
int i_DummyRead = 0; int i_DummyRead = 0;
i_TimerCounter1Init = 0; i_TimerCounter1Init = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7