Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4109508a authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

pinctrl: uniphier: set pinctrl_desc name in common probe function 



Every SoC driver sets the same name for struct pinctrl_desc and
platform_driver.  The common probe function can set desc->name
instead of duplicating strings in each SoC driver.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7d36b245

drivers/pinctrl/uniphier/pinctrl-uniphier-core.c

+1 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ int uniphier_pinctrl_probe(struct platform_device *pdev, 
	}



	priv->socdata = socdata;

	desc->name = dev->driver->name;

	desc->pctlops = &uniphier_pctlops;

	desc->pmxops = &uniphier_pmxops;

	desc->confops = &uniphier_confops;

drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

+1 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#include "pinctrl-uniphier.h"



#define DRIVER_NAME "uniphier-ld4-pinctrl"



static const struct pinctrl_pin_desc uniphier_ld4_pins[] = {

	UNIPHIER_PINCTRL_PIN(0, "EA1", UNIPHIER_PIN_IECTRL_NONE,

			     8, UNIPHIER_PIN_DRV_4_8,
@@ -858,7 +856,6 @@ static struct uniphier_pinctrl_socdata uniphier_ld4_pindata = { 
};



static struct pinctrl_desc uniphier_ld4_pinctrl_desc = {

	.name = DRIVER_NAME,

	.pins = uniphier_ld4_pins,

	.npins = ARRAY_SIZE(uniphier_ld4_pins),

};
@@ -878,7 +875,7 @@ MODULE_DEVICE_TABLE(of, uniphier_ld4_pinctrl_match); 
static struct platform_driver uniphier_ld4_pinctrl_driver = {

	.probe = uniphier_ld4_pinctrl_probe,

	.driver = {

		.name = DRIVER_NAME,

		.name = "uniphier-ld4-pinctrl",

		.of_match_table = uniphier_ld4_pinctrl_match,

	},

};

drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

+1 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#include "pinctrl-uniphier.h"



#define DRIVER_NAME "uniphier-ld6b-pinctrl"



static const struct pinctrl_pin_desc uniphier_ld6b_pins[] = {

	UNIPHIER_PINCTRL_PIN(0, "ED0", UNIPHIER_PIN_IECTRL_NONE,

			     0, UNIPHIER_PIN_DRV_4_8,
@@ -1246,7 +1244,6 @@ static struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = { 
};



static struct pinctrl_desc uniphier_ld6b_pinctrl_desc = {

	.name = DRIVER_NAME,

	.pins = uniphier_ld6b_pins,

	.npins = ARRAY_SIZE(uniphier_ld6b_pins),

};
@@ -1266,7 +1263,7 @@ MODULE_DEVICE_TABLE(of, uniphier_ld6b_pinctrl_match); 
static struct platform_driver uniphier_ld6b_pinctrl_driver = {

	.probe = uniphier_ld6b_pinctrl_probe,

	.driver = {

		.name = DRIVER_NAME,

		.name = "uniphier-ld6b-pinctrl",

		.of_match_table = uniphier_ld6b_pinctrl_match,

	},

};

drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c

+1 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#include "pinctrl-uniphier.h"



#define DRIVER_NAME "uniphier-pro4-pinctrl"



static const struct pinctrl_pin_desc uniphier_pro4_pins[] = {

	UNIPHIER_PINCTRL_PIN(0, "CK24O", UNIPHIER_PIN_IECTRL_NONE,

			     0, UNIPHIER_PIN_DRV_4_8,
@@ -1532,7 +1530,6 @@ static struct uniphier_pinctrl_socdata uniphier_pro4_pindata = { 
};



static struct pinctrl_desc uniphier_pro4_pinctrl_desc = {

	.name = DRIVER_NAME,

	.pins = uniphier_pro4_pins,

	.npins = ARRAY_SIZE(uniphier_pro4_pins),

};
@@ -1552,7 +1549,7 @@ MODULE_DEVICE_TABLE(of, uniphier_pro4_pinctrl_match); 
static struct platform_driver uniphier_pro4_pinctrl_driver = {

	.probe = uniphier_pro4_pinctrl_probe,

	.driver = {

		.name = DRIVER_NAME,

		.name = "uniphier-pro4-pinctrl",

		.of_match_table = uniphier_pro4_pinctrl_match,

	},

};

drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c

+1 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#include "pinctrl-uniphier.h"



#define DRIVER_NAME "uniphier-pro5-pinctrl"



static const struct pinctrl_pin_desc uniphier_pro5_pins[] = {

	UNIPHIER_PINCTRL_PIN(0, "AEXCKA1", 0,

			     0, UNIPHIER_PIN_DRV_4_8,
@@ -1323,7 +1321,6 @@ static struct uniphier_pinctrl_socdata uniphier_pro5_pindata = { 
};



static struct pinctrl_desc uniphier_pro5_pinctrl_desc = {

	.name = DRIVER_NAME,

	.pins = uniphier_pro5_pins,

	.npins = ARRAY_SIZE(uniphier_pro5_pins),

};
@@ -1343,7 +1340,7 @@ MODULE_DEVICE_TABLE(of, uniphier_pro5_pinctrl_match); 
static struct platform_driver uniphier_pro5_pinctrl_driver = {

	.probe = uniphier_pro5_pinctrl_probe,

	.driver = {

		.name = DRIVER_NAME,

		.name = "uniphier-pro5-pinctrl",

		.of_match_table = uniphier_pro5_pinctrl_match,

	},

};