From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-pm@vger.kernel.org,
"Geert Uytterhoeven" <geert+renesas@glider.be>
Subject: [PATCH 01/14] pinctrl: sh-pfc: Remove matching on plain sh-pfc platform device
Date: Wed, 4 Oct 2017 11:07:00 +0200 [thread overview]
Message-ID: <1507108033-8606-2-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1507108033-8606-1-git-send-email-geert+renesas@glider.be>
As of commit 8682b3c522c639f3 ("sh-pfc: Remove platform device
registration"), plain "sh-pfc" platform devices are no longer created.
Hence remove their match entry, and the now obsolete checks for missing
device IDs and driver data.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/pinctrl/sh-pfc/core.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index 0c5e952461fdf7c6..9cdbaeab2cf10d46 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -569,7 +569,6 @@ static const struct of_device_id sh_pfc_of_table[] = {
static int sh_pfc_probe(struct platform_device *pdev)
{
- const struct platform_device_id *platid = platform_get_device_id(pdev);
#ifdef CONFIG_OF
struct device_node *np = pdev->dev.of_node;
#endif
@@ -582,10 +581,7 @@ static int sh_pfc_probe(struct platform_device *pdev)
info = of_device_get_match_data(&pdev->dev);
else
#endif
- info = platid ? (const void *)platid->driver_data : NULL;
-
- if (info == NULL)
- return -ENODEV;
+ info = (const void *)platform_get_device_id(pdev)->driver_data;
pfc = devm_kzalloc(&pdev->dev, sizeof(*pfc), GFP_KERNEL);
if (pfc == NULL)
@@ -683,7 +679,6 @@ static const struct platform_device_id sh_pfc_id_table[] = {
#ifdef CONFIG_PINCTRL_PFC_SHX3
{ "pfc-shx3", (kernel_ulong_t)&shx3_pinmux_info },
#endif
- { "sh-pfc", 0 },
{ },
};
--
2.7.4
next prev parent reply other threads:[~2017-10-04 9:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 9:06 [PATCH 00/14] pinctrl: sh-pfc: Add suspend/resume support Geert Uytterhoeven
2017-10-04 9:07 ` Geert Uytterhoeven [this message]
2017-10-04 9:52 ` [PATCH 01/14] pinctrl: sh-pfc: Remove matching on plain sh-pfc platform device Laurent Pinchart
2017-10-04 9:07 ` [PATCH 02/14] pinctrl: sh-pfc: Drop width parameter of sh_pfc_{read,write}_reg() Geert Uytterhoeven
2017-10-04 9:55 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 03/14] pinctrl: sh-pfc: Add generic bias register description Geert Uytterhoeven
2017-10-04 10:26 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 04/14] pinctrl: sh-pfc: Add sh_pfc_pin_to_bias_reg() helper Geert Uytterhoeven
2017-10-04 10:12 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 05/14] pinctrl: sh-pfc: r8a7795-es1: Use generic bias register description Geert Uytterhoeven
2017-10-04 10:40 ` Laurent Pinchart
2017-10-04 10:44 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 06/14] pinctrl: sh-pfc: r8a7795: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 07/14] pinctrl: sh-pfc: r8a7796: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 08/14] pinctrl: sh-pfc: r8a7778: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 09/14] pinctrl: sh-pfc: Remove obsolete sh_pfc_pin_to_bias_info() Geert Uytterhoeven
2017-10-04 10:27 ` Laurent Pinchart
2017-10-04 9:07 ` [PATCH 10/14] pinctrl: sh-pfc: Add generic IOCTRL register description Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 11/14] pinctrl: sh-pfc: r8a7795-es1: Use " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 12/14] pinctrl: sh-pfc: r8a7795: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 13/14] pinctrl: sh-pfc: r8a7796: " Geert Uytterhoeven
2017-10-04 9:07 ` [PATCH 14/14] pinctrl: sh-pfc: Save/restore registers for PSCI system suspend Geert Uytterhoeven
2017-10-04 19:19 ` [PATCH 00/14] pinctrl: sh-pfc: Add suspend/resume support Geert Uytterhoeven
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=1507108033-8606-2-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
/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).