iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: sh-pfc: Remove matching on plain sh-pfc platform device

Browse Source 
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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Geert Uytterhoeven 2017-09-29 10:08:56 +02:00
parent df73da6317
commit 35406b1fd6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pinctrl/sh-pfc/core.c
View File

@ -569,7 +569,6 @@ static const struct of_device_id sh_pfc_of_table[] = {
static int sh_pfc_probe(struct platform_device *pdev) static int sh_pfc_probe(struct platform_device *pdev)
{ {
const struct platform_device_id *platid = platform_get_device_id(pdev);
#ifdef CONFIG_OF #ifdef CONFIG_OF
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
#endif #endif
@ -582,10 +581,7 @@ static int sh_pfc_probe(struct platform_device *pdev)
info = of_device_get_match_data(&pdev->dev); info = of_device_get_match_data(&pdev->dev);
else else
#endif #endif
info = platid ? (const void *)platid->driver_data : NULL; info = (const void *)platform_get_device_id(pdev)->driver_data;
if (info == NULL)
return -ENODEV;
pfc = devm_kzalloc(&pdev->dev, sizeof(*pfc), GFP_KERNEL); pfc = devm_kzalloc(&pdev->dev, sizeof(*pfc), GFP_KERNEL);
if (pfc == NULL) if (pfc == NULL)
@ -683,7 +679,6 @@ static const struct platform_device_id sh_pfc_id_table[] = {
#ifdef CONFIG_PINCTRL_PFC_SHX3 #ifdef CONFIG_PINCTRL_PFC_SHX3
{ "pfc-shx3", (kernel_ulong_t)&shx3_pinmux_info }, { "pfc-shx3", (kernel_ulong_t)&shx3_pinmux_info },
#endif #endif
{ "sh-pfc", 0 },
{ }, { },
}; };