From 3d8d18fa1701fb2f752f0d9d9a2afd5cd61ec0d3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 29 Oct 2012 17:03:54 -0700 Subject: [PATCH] --- yaml --- r: 337439 b: refs/heads/master c: 67ae9a429152a98adbc023c3ce56d85a38c388e2 h: refs/heads/master i: 337437: 46f7be95f5ba6f9193ff312d782ca963db89d350 337435: 36d3e45c0fbf06e92e9d92e732dc1c39493a7ebf 337431: 4e456c49054f9f121151558a660bbd84c2178225 337423: a94670b22cea2fcb23732da7b7bebdc83037b9eb 337407: 3a0a194d55d2aa0f35dc9871d38771cf89062ff7 v: v3 --- [refs] | 2 +- .../comedi/drivers/addi-data/addi_eeprom.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index d58a3e73784f..fd5d01149df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa36c7720aa65417a992c9722a2ee34c74572d50 +refs/heads/master: 67ae9a429152a98adbc023c3ce56d85a38c388e2 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index c42f05c612f7..b95d4c571774 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -107,12 +107,6 @@ struct str_AnalogInputHeader { unsigned char b_Resolution; }; -int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress, - char *pc_PCIChipInformation, struct comedi_device *dev); - -unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation, - unsigned short w_EepromStartAddress); - static void v_EepromClock76(unsigned int dw_Address, unsigned int dw_RegisterValue) { @@ -213,8 +207,9 @@ static void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress) } while (b_EepromBusy == 0x80); } -unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation, - unsigned short w_EepromStartAddress) +static unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, + char *pc_PCIChipInformation, + unsigned short w_EepromStartAddress) { unsigned char b_Counter = 0; unsigned char b_ReadByte = 0; @@ -437,8 +432,9 @@ static int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress, return 0; } -int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress, - char *pc_PCIChipInformation, struct comedi_device *dev) +static int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress, + char *pc_PCIChipInformation, + struct comedi_device *dev) { const struct addi_board *this_board = comedi_board(dev); struct addi_private *devpriv = dev->private;