From: Gabor Juhos Date: Sun, 18 Mar 2012 22:06:19 +0000 (+0000) Subject: generic: ar8216: add setup_port field to ar8xxx_chip X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=006b3b846eea3bd9c2ac9f2eabe5d02df7d10882;p=librecmc%2Flibrecmc.git generic: ar8216: add setup_port field to ar8xxx_chip SVN-Revision: 30999 --- diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 34084517a3..4c64b460ba 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -40,6 +40,8 @@ struct ar8216_priv; struct ar8xxx_chip { int (*hw_init)(struct ar8216_priv *priv); + void (*setup_port)(struct ar8216_priv *priv, int port, u32 egress, + u32 ingress, u32 members, u32 pvid); }; struct ar8216_priv { @@ -590,12 +592,8 @@ ar8216_hw_apply(struct switch_dev *dev) ingress = AR8216_IN_PORT_ONLY; } - if (priv->chip_type == AR8236) - ar8236_setup_port(priv, i, egress, ingress, portmask[i], - pvid); - else - ar8216_setup_port(priv, i, egress, ingress, portmask[i], - pvid); + priv->chip->setup_port(priv, i, egress, ingress, portmask[i], + pvid); } mutex_unlock(&priv->reg_mutex); return 0; @@ -745,14 +743,17 @@ ar8216_init_port(struct ar8216_priv *priv, int port) static const struct ar8xxx_chip ar8216_chip = { .hw_init = ar8216_hw_init, + .setup_port = ar8216_setup_port, }; static const struct ar8xxx_chip ar8236_chip = { .hw_init = ar8236_hw_init, + .setup_port = ar8236_setup_port, }; static const struct ar8xxx_chip ar8316_chip = { .hw_init = ar8316_hw_init, + .setup_port = ar8216_setup_port, }; static int