Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-16 14:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: dsa: remove NULL check for priv and platform data

Browse source 
Because the uclass has the "*_auto" properties set, the driver model
will take care of allocating the private structures for us and they
can't be NULL. Drop the checks.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Michael Walle 2021-02-24 17:40:41 +01:00 • committed by Priyanka Jain
parent e5d7d11928
commit 108157c468
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
net/dsa-uclass.c
View file

@ -28,8 +28,8 @@ int dsa_set_tagging(struct udevice *dev, ushort headroom, ushort tailroom)
{ {
struct dsa_priv *priv; struct dsa_priv *priv;
if (!dev || !dev_get_uclass_priv(dev)) if (!dev)
return -ENODEV; return -EINVAL;
if (headroom + tailroom > DSA_MAX_OVR) if (headroom + tailroom > DSA_MAX_OVR)
return -EINVAL; return -EINVAL;
@ -47,11 +47,13 @@ int dsa_set_tagging(struct udevice *dev, ushort headroom, ushort tailroom)
/* returns the DSA master Ethernet device */ /* returns the DSA master Ethernet device */
struct udevice *dsa_get_master(struct udevice *dev) struct udevice *dsa_get_master(struct udevice *dev)
{ {
struct dsa_priv *priv = dev_get_uclass_priv(dev); struct dsa_priv *priv;
if (!priv) if (!dev)
return NULL; return NULL;
priv = dev_get_uclass_priv(dev);
return priv->master_dev; return priv->master_dev;
} }
@ -67,9 +69,6 @@ static int dsa_port_start(struct udevice *pdev)
struct dsa_ops *ops = dsa_get_ops(dev); struct dsa_ops *ops = dsa_get_ops(dev);
int err; int err;
if (!priv)
return -ENODEV;
if (!master) { if (!master) {
dev_err(pdev, "DSA master Ethernet device not found!\n"); dev_err(pdev, "DSA master Ethernet device not found!\n");
return -EINVAL; return -EINVAL;
@ -101,9 +100,6 @@ static void dsa_port_stop(struct udevice *pdev)
struct udevice *master = dsa_get_master(dev); struct udevice *master = dsa_get_master(dev);
struct dsa_ops *ops = dsa_get_ops(dev); struct dsa_ops *ops = dsa_get_ops(dev);
if (!priv)
return;
if (ops->port_disable) { if (ops->port_disable) {
struct dsa_port_pdata *port_pdata; struct dsa_port_pdata *port_pdata;
@ -347,7 +343,7 @@ static int dsa_post_bind(struct udevice *dev)
ofnode node = dev_ofnode(dev), pnode; ofnode node = dev_ofnode(dev), pnode;
int i, err, first_err = 0; int i, err, first_err = 0;
if (!pdata || !ofnode_valid(node)) if (!ofnode_valid(node))
return -ENODEV; return -ENODEV;
pdata->master_node = ofnode_null(); pdata->master_node = ofnode_null();
@ -459,9 +455,6 @@ static int dsa_pre_probe(struct udevice *dev)
struct dsa_pdata *pdata = dev_get_uclass_plat(dev); struct dsa_pdata *pdata = dev_get_uclass_plat(dev);
struct dsa_priv *priv = dev_get_uclass_priv(dev); struct dsa_priv *priv = dev_get_uclass_priv(dev);
if (!pdata || !priv)
return -ENODEV;
priv->num_ports = pdata->num_ports; priv->num_ports = pdata->num_ports;
priv->cpu_port = pdata->cpu_port; priv->cpu_port = pdata->cpu_port;
priv->cpu_port_fixed_phy = fixed_phy_create(pdata->cpu_port_node); priv->cpu_port_fixed_phy = fixed_phy_create(pdata->cpu_port_node);