Skip to content

Commit 5c5b0c4

Browse files
robimarkoPaolo Abeni
authored andcommitted
net: dsa: mv88e6xxx: rename mv88e6xxx_g2_scratch_gpio_set_smi
The name mv88e6xxx_g2_scratch_gpio_set_smi is a bit ambiguous as it appears to only be applicable to the 6390 family, so lets rename it to mv88e6390_g2_scratch_gpio_set_smi to make it more obvious. Signed-off-by: Robert Marko <robimarko@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 67ea41d commit 5c5b0c4

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3712,7 +3712,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
37123712

37133713
if (external) {
37143714
mv88e6xxx_reg_lock(chip);
3715-
err = mv88e6xxx_g2_scratch_gpio_set_smi(chip, true);
3715+
err = mv88e6390_g2_scratch_gpio_set_smi(chip, true);
37163716
mv88e6xxx_reg_unlock(chip);
37173717

37183718
if (err)

drivers/net/dsa/mv88e6xxx/global2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ extern const struct mv88e6xxx_avb_ops mv88e6390_avb_ops;
378378

379379
extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops;
380380

381-
int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
381+
int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
382382
bool external);
383383
int mv88e6352_g2_scratch_port_has_serdes(struct mv88e6xxx_chip *chip, int port);
384384
int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin);

drivers/net/dsa/mv88e6xxx/global2_scratch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,15 @@ const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops = {
240240
};
241241

242242
/**
243-
* mv88e6xxx_g2_scratch_gpio_set_smi - set gpio muxing for external smi
243+
* mv88e6390_g2_scratch_gpio_set_smi - set gpio muxing for external smi
244244
* @chip: chip private data
245245
* @external: set mux for external smi, or free for gpio usage
246246
*
247247
* Some mv88e6xxx models have GPIO pins that may be configured as
248248
* an external SMI interface, or they may be made free for other
249249
* GPIO uses.
250250
*/
251-
int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
251+
int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
252252
bool external)
253253
{
254254
int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;

0 commit comments

Comments
 (0)