diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-09-29 12:21:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-30 01:25:59 -0400 |
commit | de33376b39b6ea939d53ea44c8c6595b80826501 (patch) | |
tree | 9c3304e61b0766d1028ab025a8d8bd947c31d408 | |
parent | 6dc10bbc467d6f76e2665b865d0d8f9e0049b3e6 (diff) |
net: dsa: mv88e6xxx: expose mv88e6xxx_num_databases
The mv88e6xxx_num_databases will be used by shared code, so move it
inline to the header file.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 5 | ||||
-rw-r--r-- | drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index b7eecc957bcc..6a55bba943c3 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c | |||
@@ -560,11 +560,6 @@ static bool mv88e6xxx_6352_family(struct mv88e6xxx_chip *chip) | |||
560 | return chip->info->family == MV88E6XXX_FAMILY_6352; | 560 | return chip->info->family == MV88E6XXX_FAMILY_6352; |
561 | } | 561 | } |
562 | 562 | ||
563 | static unsigned int mv88e6xxx_num_databases(struct mv88e6xxx_chip *chip) | ||
564 | { | ||
565 | return chip->info->num_databases; | ||
566 | } | ||
567 | |||
568 | /* We expect the switch to perform auto negotiation if there is a real | 563 | /* We expect the switch to perform auto negotiation if there is a real |
569 | * phy. However, in the case of a fixed link phy, we force the port | 564 | * phy. However, in the case of a fixed link phy, we force the port |
570 | * settings from the fixed link settings. | 565 | * settings from the fixed link settings. |
diff --git a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h index 6c8584f14388..20fe6c61d5a7 100644 --- a/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h +++ b/drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | |||
@@ -732,6 +732,11 @@ static inline bool mv88e6xxx_has(struct mv88e6xxx_chip *chip, | |||
732 | return (chip->info->flags & flags) == flags; | 732 | return (chip->info->flags & flags) == flags; |
733 | } | 733 | } |
734 | 734 | ||
735 | static inline unsigned int mv88e6xxx_num_databases(struct mv88e6xxx_chip *chip) | ||
736 | { | ||
737 | return chip->info->num_databases; | ||
738 | } | ||
739 | |||
735 | int mv88e6xxx_read(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val); | 740 | int mv88e6xxx_read(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val); |
736 | int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val); | 741 | int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val); |
737 | int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg, | 742 | int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg, |