Loading net/dsa/dsa2.c +8 −8 Original line number Original line Diff line number Diff line Loading @@ -93,7 +93,7 @@ static bool dsa_port_is_cpu(struct dsa_port *port) return !!of_parse_phandle(port->dn, "ethernet", 0); return !!of_parse_phandle(port->dn, "ethernet", 0); } } static bool dsa_ds_find_port(struct dsa_switch *ds, static bool dsa_ds_find_port_dn(struct dsa_switch *ds, struct device_node *port) struct device_node *port) { { u32 index; u32 index; Loading @@ -104,7 +104,7 @@ static bool dsa_ds_find_port(struct dsa_switch *ds, return false; return false; } } static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst, static struct dsa_switch *dsa_dst_find_port_dn(struct dsa_switch_tree *dst, struct device_node *port) struct device_node *port) { { struct dsa_switch *ds; struct dsa_switch *ds; Loading @@ -115,7 +115,7 @@ static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst, if (!ds) if (!ds) continue; continue; if (dsa_ds_find_port(ds, port)) if (dsa_ds_find_port_dn(ds, port)) return ds; return ds; } } Loading @@ -136,7 +136,7 @@ static int dsa_port_complete(struct dsa_switch_tree *dst, if (!link) if (!link) break; break; dst_ds = dsa_dst_find_port(dst, link); dst_ds = dsa_dst_find_port_dn(dst, link); of_node_put(link); of_node_put(link); if (!dst_ds) if (!dst_ds) Loading Loading @@ -545,7 +545,7 @@ static int dsa_parse_ports_dn(struct device_node *ports, struct dsa_switch *ds) return 0; return 0; } } static int dsa_parse_member(struct device_node *np, u32 *tree, u32 *index) static int dsa_parse_member_dn(struct device_node *np, u32 *tree, u32 *index) { { int err; int err; Loading Loading @@ -591,7 +591,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev) u32 tree, index; u32 tree, index; int i, err; int i, err; err = dsa_parse_member(np, &tree, &index); err = dsa_parse_member_dn(np, &tree, &index); if (err) if (err) return err; return err; Loading Loading
net/dsa/dsa2.c +8 −8 Original line number Original line Diff line number Diff line Loading @@ -93,7 +93,7 @@ static bool dsa_port_is_cpu(struct dsa_port *port) return !!of_parse_phandle(port->dn, "ethernet", 0); return !!of_parse_phandle(port->dn, "ethernet", 0); } } static bool dsa_ds_find_port(struct dsa_switch *ds, static bool dsa_ds_find_port_dn(struct dsa_switch *ds, struct device_node *port) struct device_node *port) { { u32 index; u32 index; Loading @@ -104,7 +104,7 @@ static bool dsa_ds_find_port(struct dsa_switch *ds, return false; return false; } } static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst, static struct dsa_switch *dsa_dst_find_port_dn(struct dsa_switch_tree *dst, struct device_node *port) struct device_node *port) { { struct dsa_switch *ds; struct dsa_switch *ds; Loading @@ -115,7 +115,7 @@ static struct dsa_switch *dsa_dst_find_port(struct dsa_switch_tree *dst, if (!ds) if (!ds) continue; continue; if (dsa_ds_find_port(ds, port)) if (dsa_ds_find_port_dn(ds, port)) return ds; return ds; } } Loading @@ -136,7 +136,7 @@ static int dsa_port_complete(struct dsa_switch_tree *dst, if (!link) if (!link) break; break; dst_ds = dsa_dst_find_port(dst, link); dst_ds = dsa_dst_find_port_dn(dst, link); of_node_put(link); of_node_put(link); if (!dst_ds) if (!dst_ds) Loading Loading @@ -545,7 +545,7 @@ static int dsa_parse_ports_dn(struct device_node *ports, struct dsa_switch *ds) return 0; return 0; } } static int dsa_parse_member(struct device_node *np, u32 *tree, u32 *index) static int dsa_parse_member_dn(struct device_node *np, u32 *tree, u32 *index) { { int err; int err; Loading Loading @@ -591,7 +591,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev) u32 tree, index; u32 tree, index; int i, err; int i, err; err = dsa_parse_member(np, &tree, &index); err = dsa_parse_member_dn(np, &tree, &index); if (err) if (err) return err; return err; Loading