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

Commit 150632b0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: pinctrl: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Barry Song <baohua.song@csr.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a167f45

drivers/pinctrl/mvebu/pinctrl-armada-370.c

+4 −4
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = { 


static struct mvebu_pinctrl_soc_info armada_370_pinctrl_info;



static struct of_device_id armada_370_pinctrl_of_match[] __devinitdata = {

static struct of_device_id armada_370_pinctrl_of_match[] = {

	{ .compatible = "marvell,mv88f6710-pinctrl" },

	{ },

};
@@ -382,7 +382,7 @@ static struct pinctrl_gpio_range mv88f6710_mpp_gpio_ranges[] = { 
	MPP_GPIO_RANGE(2,  64, 64,  2),

};



static int __devinit armada_370_pinctrl_probe(struct platform_device *pdev)

static int armada_370_pinctrl_probe(struct platform_device *pdev)

{

	struct mvebu_pinctrl_soc_info *soc = &armada_370_pinctrl_info;
@@ -399,7 +399,7 @@ static int __devinit armada_370_pinctrl_probe(struct platform_device *pdev) 
	return mvebu_pinctrl_probe(pdev);

}



static int __devexit armada_370_pinctrl_remove(struct platform_device *pdev)

static int armada_370_pinctrl_remove(struct platform_device *pdev)

{

	return mvebu_pinctrl_remove(pdev);

}
@@ -411,7 +411,7 @@ static struct platform_driver armada_370_pinctrl_driver = { 
		.of_match_table = of_match_ptr(armada_370_pinctrl_of_match),

	},

	.probe = armada_370_pinctrl_probe,

	.remove = __devexit_p(armada_370_pinctrl_remove),

	.remove = armada_370_pinctrl_remove,

};



module_platform_driver(armada_370_pinctrl_driver);

drivers/pinctrl/mvebu/pinctrl-armada-xp.c

+4 −4
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = { 


static struct mvebu_pinctrl_soc_info armada_xp_pinctrl_info;



static struct of_device_id armada_xp_pinctrl_of_match[] __devinitdata = {

static struct of_device_id armada_xp_pinctrl_of_match[] = {

	{

		.compatible = "marvell,mv78230-pinctrl",

		.data       = (void *) V_MV78230,
@@ -394,7 +394,7 @@ static struct pinctrl_gpio_range mv78460_mpp_gpio_ranges[] = { 
	MPP_GPIO_RANGE(2,  64, 64,  3),

};



static int __devinit armada_xp_pinctrl_probe(struct platform_device *pdev)

static int armada_xp_pinctrl_probe(struct platform_device *pdev)

{

	struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info;

	const struct of_device_id *match =
@@ -446,7 +446,7 @@ static int __devinit armada_xp_pinctrl_probe(struct platform_device *pdev) 
	return mvebu_pinctrl_probe(pdev);

}



static int __devexit armada_xp_pinctrl_remove(struct platform_device *pdev)

static int armada_xp_pinctrl_remove(struct platform_device *pdev)

{

	return mvebu_pinctrl_remove(pdev);

}
@@ -458,7 +458,7 @@ static struct platform_driver armada_xp_pinctrl_driver = { 
		.of_match_table = of_match_ptr(armada_xp_pinctrl_of_match),

	},

	.probe = armada_xp_pinctrl_probe,

	.remove = __devexit_p(armada_xp_pinctrl_remove),

	.remove = armada_xp_pinctrl_remove,

};



module_platform_driver(armada_xp_pinctrl_driver);

drivers/pinctrl/mvebu/pinctrl-dove.c

+4 −4
Original line number Diff line number Diff line
@@ -579,12 +579,12 @@ static struct mvebu_pinctrl_soc_info dove_pinctrl_info = { 


static struct clk *clk;



static struct of_device_id dove_pinctrl_of_match[] __devinitdata = {

static struct of_device_id dove_pinctrl_of_match[] = {

	{ .compatible = "marvell,dove-pinctrl", .data = &dove_pinctrl_info },

	{ }

};



static int __devinit dove_pinctrl_probe(struct platform_device *pdev)

static int dove_pinctrl_probe(struct platform_device *pdev)

{

	const struct of_device_id *match =

		of_match_device(dove_pinctrl_of_match, &pdev->dev);
@@ -601,7 +601,7 @@ static int __devinit dove_pinctrl_probe(struct platform_device *pdev) 
	return mvebu_pinctrl_probe(pdev);

}



static int __devexit dove_pinctrl_remove(struct platform_device *pdev)

static int dove_pinctrl_remove(struct platform_device *pdev)

{

	int ret;
@@ -618,7 +618,7 @@ static struct platform_driver dove_pinctrl_driver = { 
		.of_match_table = of_match_ptr(dove_pinctrl_of_match),

	},

	.probe = dove_pinctrl_probe,

	.remove = __devexit_p(dove_pinctrl_remove),

	.remove = dove_pinctrl_remove,

};



module_platform_driver(dove_pinctrl_driver);

drivers/pinctrl/mvebu/pinctrl-kirkwood.c

+4 −4
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static struct mvebu_pinctrl_soc_info mv98dx4122_info = { 
	.ngpioranges = ARRAY_SIZE(mv88f628x_gpio_ranges),

};



static struct of_device_id kirkwood_pinctrl_of_match[] __devinitdata = {

static struct of_device_id kirkwood_pinctrl_of_match[] = {

	{ .compatible = "marvell,88f6180-pinctrl", .data = &mv88f6180_info },

	{ .compatible = "marvell,88f6190-pinctrl", .data = &mv88f6190_info },

	{ .compatible = "marvell,88f6192-pinctrl", .data = &mv88f6192_info },
@@ -454,7 +454,7 @@ static struct of_device_id kirkwood_pinctrl_of_match[] __devinitdata = { 
	{ }

};



static int __devinit kirkwood_pinctrl_probe(struct platform_device *pdev)

static int kirkwood_pinctrl_probe(struct platform_device *pdev)

{

	const struct of_device_id *match =

		of_match_device(kirkwood_pinctrl_of_match, &pdev->dev);
@@ -462,7 +462,7 @@ static int __devinit kirkwood_pinctrl_probe(struct platform_device *pdev) 
	return mvebu_pinctrl_probe(pdev);

}



static int __devexit kirkwood_pinctrl_remove(struct platform_device *pdev)

static int kirkwood_pinctrl_remove(struct platform_device *pdev)

{

	return mvebu_pinctrl_remove(pdev);

}
@@ -474,7 +474,7 @@ static struct platform_driver kirkwood_pinctrl_driver = { 
		.of_match_table = of_match_ptr(kirkwood_pinctrl_of_match),

	},

	.probe = kirkwood_pinctrl_probe,

	.remove = __devexit_p(kirkwood_pinctrl_remove),

	.remove = kirkwood_pinctrl_remove,

};



module_platform_driver(kirkwood_pinctrl_driver);

drivers/pinctrl/mvebu/pinctrl-mvebu.c

+5 −6
Original line number Diff line number Diff line
@@ -478,8 +478,7 @@ static struct pinctrl_ops mvebu_pinctrl_ops = { 
	.dt_free_map = mvebu_pinctrl_dt_free_map,

};



static int __devinit _add_function(struct mvebu_pinctrl_function *funcs,

				   const char *name)

static int _add_function(struct mvebu_pinctrl_function *funcs, const char *name)

{

	while (funcs->num_groups) {

		/* function already there */
@@ -494,7 +493,7 @@ static int __devinit _add_function(struct mvebu_pinctrl_function *funcs, 
	return 0;

}



static int __devinit mvebu_pinctrl_build_functions(struct platform_device *pdev,

static int mvebu_pinctrl_build_functions(struct platform_device *pdev,

					 struct mvebu_pinctrl *pctl)

{

	struct mvebu_pinctrl_function *funcs;
@@ -568,7 +567,7 @@ static int __devinit mvebu_pinctrl_build_functions(struct platform_device *pdev, 
	return 0;

}



int __devinit mvebu_pinctrl_probe(struct platform_device *pdev)

int mvebu_pinctrl_probe(struct platform_device *pdev)

{

	struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);

	struct device_node *np = pdev->dev.of_node;
@@ -745,7 +744,7 @@ int __devinit mvebu_pinctrl_probe(struct platform_device *pdev) 
	return 0;

}



int __devexit mvebu_pinctrl_remove(struct platform_device *pdev)

int mvebu_pinctrl_remove(struct platform_device *pdev)

{

	struct mvebu_pinctrl *pctl = platform_get_drvdata(pdev);

	pinctrl_unregister(pctl->pctldev);