Skip to content

Commit

Permalink
staging: comedi: gsc_hpdi: make internal functions static
Browse files Browse the repository at this point in the history
This module does not export any symbols so declare all the functions as
`static` and remove the unused ones.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 95b2468 commit b776d05
Showing 1 changed file with 5 additions and 82 deletions.
87 changes: 5 additions & 82 deletions drivers/staging/comedi/drivers/gsc_hpdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,35 +104,11 @@ enum hpdi_registers {
INTERRUPT_POLARITY_REG = 0x54,
};

int command_channel_valid(unsigned int channel)
{
if (channel == 0 || channel > 6) {
printk(KERN_WARNING
"gsc_hpdi: bug! invalid cable command channel\n");
return 0;
}
return 1;
}

/* bit definitions */

enum firmware_revision_bits {
FEATURES_REG_PRESENT_BIT = 0x8000,
};
int firmware_revision(uint32_t fwr_bits)
{
return fwr_bits & 0xff;
}

int pcb_revision(uint32_t fwr_bits)
{
return (fwr_bits >> 8) & 0xff;
}

int hpdi_subid(uint32_t fwr_bits)
{
return (fwr_bits >> 16) & 0xff;
}

enum board_control_bits {
BOARD_RESET_BIT = 0x1, /* wait 10usec before accessing fifos */
Expand All @@ -147,22 +123,6 @@ enum board_control_bits {
CABLE_THROTTLE_ENABLE_BIT = 0x20,
TEST_MODE_ENABLE_BIT = 0x80000000,
};
uint32_t command_discrete_output_bits(unsigned int channel, int output,
int output_value)
{
uint32_t bits = 0;

if (command_channel_valid(channel) == 0)
return 0;
if (output) {
bits |= 0x1 << (16 + channel);
if (output_value)
bits |= 0x1 << (24 + channel);
} else
bits |= 0x1 << (24 + channel);

return bits;
}

enum board_status_bits {
COMMAND_LINE_STATUS_MASK = 0x7f,
Expand All @@ -182,28 +142,17 @@ enum board_status_bits {
RX_OVERRUN_BIT = 0x800000,
};

uint32_t almost_full_bits(unsigned int num_words)
static uint32_t almost_full_bits(unsigned int num_words)
{
/* XXX need to add or subtract one? */
/* XXX need to add or subtract one? */
return (num_words << 16) & 0xff0000;
}

uint32_t almost_empty_bits(unsigned int num_words)
static uint32_t almost_empty_bits(unsigned int num_words)
{
return num_words & 0xffff;
}

unsigned int almost_full_num_words(uint32_t bits)
{
/* XXX need to add or subtract one? */
return (bits >> 16) & 0xffff;
}

unsigned int almost_empty_num_words(uint32_t bits)
{
return bits & 0xffff;
}

enum features_bits {
FIFO_SIZE_PRESENT_BIT = 0x1,
FIFO_WORDS_PRESENT_BIT = 0x2,
Expand All @@ -225,43 +174,17 @@ enum interrupt_sources {
RX_ALMOST_FULL_INTR = 14,
RX_FULL_INTR = 15,
};
int command_intr_source(unsigned int channel)
{
if (command_channel_valid(channel) == 0)
channel = 1;
return channel + 1;
}

uint32_t intr_bit(int interrupt_source)
static uint32_t intr_bit(int interrupt_source)
{
return 0x1 << interrupt_source;
}

uint32_t tx_clock_divisor_bits(unsigned int divisor)
{
return divisor & 0xff;
}

unsigned int fifo_size(uint32_t fifo_size_bits)
static unsigned int fifo_size(uint32_t fifo_size_bits)
{
return fifo_size_bits & 0xfffff;
}

unsigned int fifo_words(uint32_t fifo_words_bits)
{
return fifo_words_bits & 0xfffff;
}

uint32_t intr_edge_bit(int interrupt_source)
{
return 0x1 << interrupt_source;
}

uint32_t intr_active_high_bit(int interrupt_source)
{
return 0x1 << interrupt_source;
}

struct hpdi_board {

char *name;
Expand Down

0 comments on commit b776d05

Please sign in to comment.