From: Andrew Lunn <andrew@lunn.ch>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
vivien.didelot@savoirfairelinux.com, john@phrozen.org
Subject: Re: [PATCH net-next 2/9] net: dsa: Add support for parsing the old binding
Date: Sat, 4 Jun 2016 22:00:16 +0200 [thread overview]
Message-ID: <20160604200016.GD2063@lunn.ch> (raw)
In-Reply-To: <1464998733-10405-5-git-send-email-f.fainelli@gmail.com>
> -static int dsa_cpu_parse(struct device_node *port, u32 index,
> - struct dsa_switch_tree *dst,
> - struct dsa_switch *ds)
> +static int _dsa_cpu_parse(struct dsa_switch_tree *dst,
> + struct dsa_switch *ds,
> + struct net_device *ethernet_dev,
> + u32 index)
> {
> - struct net_device *ethernet_dev;
> - struct device_node *ethernet;
> -
> - ethernet = of_parse_phandle(port, "ethernet", 0);
> - if (!ethernet)
> - return -EINVAL;
> -
> - ethernet_dev = of_find_net_device_by_node(ethernet);
> - if (!ethernet_dev)
> - return -EPROBE_DEFER;
> -
Hi Florian
You have just removed all the actual DT parsing. So i would give this
a different name, and avoid the _ prefix.
> +static int _dsa_register_switch_legacy(struct dsa_switch *ds, struct device_node *np)
> +{
We might want to call this _dsa_register_switch_legacy_sf2, since the
code only supports what is needed for your rather odd sf2 binding. It
does not appear to work for the generic DSA binding.
> static int __dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
> {
> struct device_node *ports = dsa_get_ports(ds, np);
> @@ -626,8 +736,8 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
> {
> struct device_node *ports = dsa_get_ports(ds, np);
>
> - if (IS_ERR(ports))
> - return PTR_ERR(ports);
> + if (IS_ERR(ports) && PTR_ERR(ports) == -EINVAL)
> + return _dsa_register_switch_legacy(ds, np);
Maybe put this inside if config_enabled(CONFIG_NET_DSA_BCM_SF2) {}?
Andrew
next prev parent reply other threads:[~2016-06-04 20:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-04 0:05 [PATCH net-next 0/9] net: dsa: misc improvements Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 1/9] net: dsa: Prepare to support legacy DT binding Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next] net: dsa: Provide CPU port statistics to master netdev Florian Fainelli
2016-06-04 0:06 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next] net: dsa: bcm_sf2: Implement FDB operations Florian Fainelli
2016-06-04 0:06 ` Florian Fainelli
2016-06-06 13:30 ` Vivien Didelot
2016-06-04 0:05 ` [PATCH net-next 2/9] net: dsa: Add support for parsing the old binding Florian Fainelli
2016-06-04 19:44 ` Andrew Lunn
2016-06-04 20:00 ` Andrew Lunn [this message]
2016-06-05 22:42 ` Florian Fainelli
2016-06-06 3:19 ` Andrew Lunn
2016-06-06 20:13 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 3/9] net: dsa: Provide unique DSA slave MII bus names Florian Fainelli
2016-06-04 20:00 ` Andrew Lunn
2016-06-06 13:36 ` Vivien Didelot
2016-06-04 0:05 ` [PATCH net-next 4/9] net: dsa: Initialize ds->enabled_port_mask and ds->phys_mii_mask Florian Fainelli
2016-06-04 20:29 ` Andrew Lunn
2016-06-05 22:38 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 5/9] net: dsa: Export suspend/resume functions Florian Fainelli
2016-06-04 20:30 ` Andrew Lunn
2016-06-06 13:40 ` Vivien Didelot
2016-06-04 0:05 ` [PATCH net-next 6/9] net: dsa: Add initialization helper for CPU port ethtool_ops Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 6/7] net: dsa: bcm_sf2: Make it a real platform device driver Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 7/9] net: dsa: Initialize CPU port ethtool ops per tree Florian Fainelli
2016-06-04 20:38 ` Andrew Lunn
2016-06-05 22:29 ` Florian Fainelli
2016-06-06 2:40 ` Andrew Lunn
2016-06-04 0:05 ` [PATCH net-next 7/7] net: dsa: bcm_sf2: Register our slave MDIO bus Florian Fainelli
2016-06-04 20:49 ` Andrew Lunn
2016-06-04 0:05 ` [PATCH net-next 8/9] net: dsa: bcm_sf2: Make it a real platform device driver Florian Fainelli
2016-06-04 20:55 ` Andrew Lunn
2016-06-05 22:30 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 9/9] net: dsa: bcm_sf2: Register our slave MDIO bus Florian Fainelli
2016-06-04 0:10 ` [PATCH net-next 0/9] net: dsa: misc improvements Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160604200016.GD2063@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=john@phrozen.org \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).