Skip to content

Commit

Permalink
ptp: ocp: constify selectors
Browse files Browse the repository at this point in the history
The ocp selectors are all constant, so label them as such.

Signed-off-by: Jonathan Lemon <[email protected]>
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
jlemon authored and kuba-moo committed May 24, 2022
1 parent aa56a7f commit 3f3fe41
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions drivers/ptp/ptp_ocp.c
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ struct ocp_selector {
int value;
};

static struct ocp_selector ptp_ocp_clock[] = {
static const struct ocp_selector ptp_ocp_clock[] = {
{ .name = "NONE", .value = 0 },
{ .name = "TOD", .value = 1 },
{ .name = "IRIG", .value = 2 },
Expand All @@ -665,7 +665,7 @@ static struct ocp_selector ptp_ocp_clock[] = {
#define SMA_SELECT_MASK ((1U << 15) - 1)
#define SMA_DISABLE 0x10000

static struct ocp_selector ptp_ocp_sma_in[] = {
static const struct ocp_selector ptp_ocp_sma_in[] = {
{ .name = "10Mhz", .value = 0x0000 },
{ .name = "PPS1", .value = 0x0001 },
{ .name = "PPS2", .value = 0x0002 },
Expand All @@ -683,7 +683,7 @@ static struct ocp_selector ptp_ocp_sma_in[] = {
{ }
};

static struct ocp_selector ptp_ocp_sma_out[] = {
static const struct ocp_selector ptp_ocp_sma_out[] = {
{ .name = "10Mhz", .value = 0x0000 },
{ .name = "PHC", .value = 0x0001 },
{ .name = "MAC", .value = 0x0002 },
Expand All @@ -700,12 +700,12 @@ static struct ocp_selector ptp_ocp_sma_out[] = {
{ }
};

static struct ocp_selector *ocp_sma_tbl[][2] = {
static const struct ocp_selector *ocp_sma_tbl[][2] = {
{ ptp_ocp_sma_in, ptp_ocp_sma_out },
};

static const char *
ptp_ocp_select_name_from_val(struct ocp_selector *tbl, int val)
ptp_ocp_select_name_from_val(const struct ocp_selector *tbl, int val)
{
int i;

Expand All @@ -716,7 +716,7 @@ ptp_ocp_select_name_from_val(struct ocp_selector *tbl, int val)
}

static int
ptp_ocp_select_val_from_name(struct ocp_selector *tbl, const char *name)
ptp_ocp_select_val_from_name(const struct ocp_selector *tbl, const char *name)
{
const char *select;
int i;
Expand All @@ -730,7 +730,7 @@ ptp_ocp_select_val_from_name(struct ocp_selector *tbl, const char *name)
}

static ssize_t
ptp_ocp_select_table_show(struct ocp_selector *tbl, char *buf)
ptp_ocp_select_table_show(const struct ocp_selector *tbl, char *buf)
{
ssize_t count;
int i;
Expand Down Expand Up @@ -2093,7 +2093,8 @@ __handle_signal_inputs(struct ptp_ocp *bp, u32 val)
*/

static ssize_t
ptp_ocp_show_output(struct ocp_selector *tbl, u32 val, char *buf, int def_val)
ptp_ocp_show_output(const struct ocp_selector *tbl, u32 val, char *buf,
int def_val)
{
const char *name;
ssize_t count;
Expand All @@ -2107,7 +2108,8 @@ ptp_ocp_show_output(struct ocp_selector *tbl, u32 val, char *buf, int def_val)
}

static ssize_t
ptp_ocp_show_inputs(struct ocp_selector *tbl, u32 val, char *buf, int def_val)
ptp_ocp_show_inputs(const struct ocp_selector *tbl, u32 val, char *buf,
int def_val)
{
const char *name;
ssize_t count;
Expand All @@ -2131,7 +2133,7 @@ ptp_ocp_show_inputs(struct ocp_selector *tbl, u32 val, char *buf, int def_val)
}

static int
sma_parse_inputs(struct ocp_selector *tbl[], const char *buf,
sma_parse_inputs(const struct ocp_selector * const tbl[], const char *buf,
enum ptp_ocp_sma_mode *mode)
{
int idx, count, dir;
Expand Down Expand Up @@ -2192,7 +2194,7 @@ ptp_ocp_sma_show(struct ptp_ocp *bp, int sma_nr, char *buf,
int default_in_val, int default_out_val)
{
struct ptp_ocp_sma_connector *sma = &bp->sma[sma_nr - 1];
struct ocp_selector **tbl;
const struct ocp_selector * const *tbl;
u32 val;

tbl = ocp_sma_tbl[bp->sma_tbl];
Expand Down

0 comments on commit 3f3fe41

Please sign in to comment.