Skip to content

Commit

Permalink
staging: comedi: addi_amcc_S5920.[ch]: remove unnecessary files
Browse files Browse the repository at this point in the history
The addi_amcc_S5920.c file only has the function i_AddiHeaderRW_ReadEeprom()
in it. The addi_amcc_S5920.h file has a prototype for this function and a
couple defines for the magic numbers used when accessing the eeprom.

The .c file is not actually built by any .config selection, or by an

The .h file is only #include'd by the hwdrv_apci3200.c file. That file
actually has a local version of the i_AddiHeaderRW_ReadEeprom() function
that is identical to the one in the .c file.

Just move the #define's from the .h file into hwdrv_apci3200.c and remove
the addi_amcc_S5920.[ch] files.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent a8b1e45 commit fd44589
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 227 deletions.
195 changes: 0 additions & 195 deletions drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c

This file was deleted.

27 changes: 0 additions & 27 deletions drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h

This file was deleted.

12 changes: 7 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,8 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+----------------------------------------------------------------------------+
*/
#include "hwdrv_apci3200.h"
/* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
#include "addi_amcc_S5920.h"
/* #define PRINT_INFO */

/* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
/* #define PRINT_INFO */

/* BEGIN JK 06.07.04: Management of sevrals boards */
/*
Expand Down Expand Up @@ -90,7 +87,12 @@ You should also find the complete GPL in the COPYING file accompanying this sour
struct str_BoardInfos s_BoardInfos[100]; /* 100 will be the max number of boards to be used */
/* END JK 06.07.04: Management of sevrals boards */

/* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
#define AMCC_OP_REG_MCSR 0x3c
#define EEPROM_BUSY 0x80000000
#define NVCMD_LOAD_LOW (0x4 << 5) /* nvRam load low command */
#define NVCMD_LOAD_HIGH (0x5 << 5) /* nvRam load high command */
#define NVCMD_BEGIN_READ (0x7 << 5) /* nvRam begin read command */
#define NVCMD_BEGIN_WRITE (0x6 << 5) /* EEPROM begin write command */

/*+----------------------------------------------------------------------------+*/
/*| Function Name : int i_AddiHeaderRW_ReadEeprom |*/
Expand Down

0 comments on commit fd44589

Please sign in to comment.