From: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Heiner Kallweit <heiner.kallweit-S0/GAf8tV78@public.gmane.org>
Cc: Heiner Kallweit
<hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
"linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Applied "spi: fsl-espi: improve return value handling in fsl_espi_probe" to the spi tree
Date: Sat, 24 Sep 2016 22:59:23 -0700 [thread overview]
Message-ID: <E1bo2TD-0003GD-3j@finisterre> (raw)
In-Reply-To: <dc06d27a-09ed-7720-d86f-9d20134557af-S0/GAf8tV78@public.gmane.org>
The patch
spi: fsl-espi: improve return value handling in fsl_espi_probe
has been applied to the spi tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 604042af7697314fffb16e266fd7d5ad488439cc Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <heiner.kallweit-S0/GAf8tV78@public.gmane.org>
Date: Sat, 17 Sep 2016 15:43:31 +0200
Subject: [PATCH] spi: fsl-espi: improve return value handling in
fsl_espi_probe
The return value of fsl_espi_probe (currently struct spi_master *)
is just used for checking whether an error occurred.
Change the return value type to int and simplify the code.
Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
drivers/spi/spi-fsl-espi.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index dee3f822cea8..7451585a080e 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -538,8 +538,8 @@ static size_t fsl_espi_max_message_size(struct spi_device *spi)
return SPCOM_TRANLEN_MAX;
}
-static struct spi_master * fsl_espi_probe(struct device *dev,
- struct resource *mem, unsigned int irq)
+static int fsl_espi_probe(struct device *dev, struct resource *mem,
+ unsigned int irq)
{
struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
struct spi_master *master;
@@ -547,13 +547,11 @@ static struct spi_master * fsl_espi_probe(struct device *dev,
struct device_node *nc;
const __be32 *prop;
u32 regval, csmode;
- int i, len, ret = 0;
+ int i, len, ret;
master = spi_alloc_master(dev, sizeof(struct mpc8xxx_spi));
- if (!master) {
- ret = -ENOMEM;
- goto err;
- }
+ if (!master)
+ return -ENOMEM;
dev_set_drvdata(dev, master);
@@ -647,7 +645,7 @@ static struct spi_master * fsl_espi_probe(struct device *dev,
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev);
- return master;
+ return 0;
err_pm:
pm_runtime_put_noidle(dev);
@@ -655,8 +653,7 @@ err_pm:
pm_runtime_set_suspended(dev);
err_probe:
spi_master_put(master);
-err:
- return ERR_PTR(ret);
+ return ret;
}
static int of_fsl_espi_get_chipselects(struct device *dev)
@@ -682,7 +679,6 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
{
struct device *dev = &ofdev->dev;
struct device_node *np = ofdev->dev.of_node;
- struct spi_master *master;
struct resource mem;
unsigned int irq;
int ret;
@@ -703,11 +699,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
if (!irq)
return -EINVAL;
- master = fsl_espi_probe(dev, &mem, irq);
- if (IS_ERR(master))
- return PTR_ERR(master);
-
- return 0;
+ return fsl_espi_probe(dev, &mem, irq);
}
static int of_fsl_espi_remove(struct platform_device *dev)
--
2.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-09-25 5:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1d67ce99-42ea-c816-da35-e64575cca8ff@web.de>
[not found] ` <1d67ce99-42ea-c816-da35-e64575cca8ff-S0/GAf8tV78@public.gmane.org>
2016-09-17 13:42 ` [PATCH 1/4] spi: fsl-espi: remove unused variable in fsl_espi_setup Heiner Kallweit
[not found] ` <a71abf9f-4254-af63-f7eb-1579faaeada3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-25 5:59 ` Applied "spi: fsl-espi: remove unused variable in fsl_espi_setup" to the spi tree Mark Brown
2016-09-17 13:43 ` [PATCH 2/4] spi: fsl-espi: simplify of_fsl_espi_probe Heiner Kallweit
[not found] ` <5bfd3921-5bb6-b9c3-dc64-3882491bba13-S0/GAf8tV78@public.gmane.org>
2016-09-24 18:46 ` Mark Brown
2016-09-25 5:59 ` Applied "spi: fsl-espi: simplify of_fsl_espi_probe" to the spi tree Mark Brown
2016-09-17 13:43 ` [PATCH 3/4] spi: fsl-espi: improve return value handling in fsl_espi_probe Heiner Kallweit
[not found] ` <dc06d27a-09ed-7720-d86f-9d20134557af-S0/GAf8tV78@public.gmane.org>
2016-09-25 5:59 ` Mark Brown [this message]
2016-09-17 13:44 ` [PATCH 4/4] spi: fsl-espi: replace of_get_property with of_property_read_u32 Heiner Kallweit
[not found] ` <faa8bb6f-a644-5779-6a65-a6d8394bd17f-S0/GAf8tV78@public.gmane.org>
2016-09-27 5:39 ` Heiner Kallweit
[not found] ` <10e52aa2-9327-8aa3-0132-74c1feefa165-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-27 16:19 ` Mark Brown
2016-10-01 19:07 ` [PATCH v2] " Heiner Kallweit
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=E1bo2TD-0003GD-3j@finisterre \
--to=broonie-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=heiner.kallweit-S0/GAf8tV78@public.gmane.org \
--cc=hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.