aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkabhadram@gmail.com>2014-12-25 23:43:39 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-12-30 01:15:55 -0500
commitf50f1c37a663b7b76013638f60a400a16ddd2158 (patch)
tree83bf6f537c0d23654eb3df318d7ef3fcb097090b
parent5eb9f8caac333842e840325fe7299465bcdf2111 (diff)
cc2520: remove 'ret' goto label
If allocation of memory fails instead of going to ret goto label and returning from there, we can directly return -ENOMEM on failure. Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/net/ieee802154/cc2520.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index bc24d9aab292..64017f1eca7f 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -844,10 +844,8 @@ static int cc2520_probe(struct spi_device *spi)
844 int ret; 844 int ret;
845 845
846 priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL); 846 priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL);
847 if (!priv) { 847 if (!priv)
848 ret = -ENOMEM; 848 return -ENOMEM;
849 goto err_ret;
850 }
851 849
852 spi_set_drvdata(spi, priv); 850 spi_set_drvdata(spi, priv);
853 851
@@ -861,10 +859,8 @@ static int cc2520_probe(struct spi_device *spi)
861 859
862 priv->buf = devm_kzalloc(&spi->dev, 860 priv->buf = devm_kzalloc(&spi->dev,
863 SPI_COMMAND_BUFFER, GFP_KERNEL); 861 SPI_COMMAND_BUFFER, GFP_KERNEL);
864 if (!priv->buf) { 862 if (!priv->buf)
865 ret = -ENOMEM; 863 return -ENOMEM;
866 goto err_ret;
867 }
868 864
869 mutex_init(&priv->buffer_mutex); 865 mutex_init(&priv->buffer_mutex);
870 INIT_WORK(&priv->fifop_irqwork, cc2520_fifop_irqwork); 866 INIT_WORK(&priv->fifop_irqwork, cc2520_fifop_irqwork);
@@ -981,8 +977,6 @@ static int cc2520_probe(struct spi_device *spi)
981err_hw_init: 977err_hw_init:
982 mutex_destroy(&priv->buffer_mutex); 978 mutex_destroy(&priv->buffer_mutex);
983 flush_work(&priv->fifop_irqwork); 979 flush_work(&priv->fifop_irqwork);
984
985err_ret:
986 return ret; 980 return ret;
987} 981}
988 982