Skip to content

Commit

Permalink
Staging: silicom: capitalize labels in the bp_media_type enum
Browse files Browse the repository at this point in the history
Capitalize the names of the media types in enum bp_media_type in
bpctl_mod.c, as is the preffered style.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Chad Williamson authored and Greg Kroah-Hartman committed Jun 24, 2013
1 parent ff2e54c commit ae0b953
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions drivers/staging/silicom/bpctl_mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ if (down_interruptible(&bpctl_sema)) { \

/* Media Types */
enum bp_media_type {
bp_copper = 0,
bp_fiber,
bp_cx4,
bp_none,
BP_COPPER = 0,
BP_FIBER,
BP_CX4,
BP_NONE,
};

struct bypass_pfs_sd {
Expand Down Expand Up @@ -3400,7 +3400,7 @@ static int bypass_status(bpctl_dev_t *pbpctl_dev)
BP10G_SDP7_DATA_IN) != 0 ? 0 : 1);
}

} else if (pbpctl_dev->media_type == bp_copper) {
} else if (pbpctl_dev->media_type == BP_COPPER) {

return (((BPCTL_READ_REG(pbpctl_dev_b, CTRL)) &
BPCTLI_CTRL_SWDPIN1) != 0 ? 1 : 0);
Expand Down Expand Up @@ -3646,7 +3646,7 @@ int tap_status(bpctl_dev_t *pbpctl_dev)
BP10G_SDP6_DATA_IN) != 0 ? 0 : 1);
}

} else if (pbpctl_dev->media_type == bp_copper)
} else if (pbpctl_dev->media_type == BP_COPPER)
return (((BPCTL_READ_REG(pbpctl_dev, CTRL)) &
BPCTLI_CTRL_SWDPIN0) != 0 ? 1 : 0);
else {
Expand Down Expand Up @@ -3741,7 +3741,7 @@ int disc_off_status(bpctl_dev_t *pbpctl_dev)
BP10G_SDP2_DATA) != 0 ? 1 : 0);

}
if (pbpctl_dev->media_type == bp_copper) {
if (pbpctl_dev->media_type == BP_COPPER) {

#if 0
return ((((read_reg(pbpctl_dev, STATUS_DISC_REG_ADDR)) &
Expand Down Expand Up @@ -4032,36 +4032,36 @@ void bypass_caps_init(bpctl_dev_t *pbpctl_dev)
}
#endif
if ((pbpctl_dev->bp_fiber5) || (pbpctl_dev->bp_10g9)) {
pbpctl_dev->media_type = bp_fiber;
pbpctl_dev->media_type = BP_FIBER;
} else if (pbpctl_dev->bp_10gb) {
if (BP10GB_CX4_SERIES(pbpctl_dev->subdevice))
pbpctl_dev->media_type = bp_cx4;
pbpctl_dev->media_type = BP_CX4;
else
pbpctl_dev->media_type = bp_fiber;
pbpctl_dev->media_type = BP_FIBER;

}

else if (pbpctl_dev->bp_540)
pbpctl_dev->media_type = bp_none;
pbpctl_dev->media_type = BP_NONE;
else if (!pbpctl_dev->bp_10g) {

ctrl_ext = BPCTL_READ_REG(pbpctl_dev, CTRL_EXT);
if ((ctrl_ext & BPCTLI_CTRL_EXT_LINK_MODE_MASK) == 0x0)
pbpctl_dev->media_type = bp_copper;
pbpctl_dev->media_type = BP_COPPER;
else
pbpctl_dev->media_type = bp_fiber;
pbpctl_dev->media_type = BP_FIBER;

} else {
if (BP10G_CX4_SERIES(pbpctl_dev->subdevice))
pbpctl_dev->media_type = bp_cx4;
pbpctl_dev->media_type = BP_CX4;
else
pbpctl_dev->media_type = bp_fiber;
pbpctl_dev->media_type = BP_FIBER;
}

if (is_bypass_fn(pbpctl_dev)) {

pbpctl_dev->bp_caps |= BP_PWOFF_ON_CAP;
if (pbpctl_dev->media_type == bp_fiber)
if (pbpctl_dev->media_type == BP_FIBER)
pbpctl_dev->bp_caps |=
(TX_CTL_CAP | TX_STATUS_CAP | TPL_CAP);

Expand Down Expand Up @@ -5030,7 +5030,7 @@ static int get_bypass_link_status(bpctl_dev_t *pbpctl_dev)
if (!pbpctl_dev)
return -1;

if (pbpctl_dev->media_type == bp_fiber)
if (pbpctl_dev->media_type == BP_FIBER)
return ((BPCTL_READ_REG(pbpctl_dev, CTRL) &
BPCTLI_CTRL_SWDPIN1));
else
Expand Down

0 comments on commit ae0b953

Please sign in to comment.