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

Drivers: pinctrl: remove __dev* attributes.

Browse Source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:10:23 -08:00
parent 5a167f4543
commit 150632b09a
39 changed files with 114 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pinctrl/mvebu/pinctrl-armada-370.c
View File

@ -367,7 +367,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
static struct mvebu_pinctrl_soc_info armada_370_pinctrl_info; 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" }, { .compatible = "marvell,mv88f6710-pinctrl" },
{ }, { },
}; };
@ -382,7 +382,7 @@ static struct pinctrl_gpio_range mv88f6710_mpp_gpio_ranges[] = {
MPP_GPIO_RANGE(2, 64, 64, 2), 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; 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); 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); 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), .of_match_table = of_match_ptr(armada_370_pinctrl_of_match),
}, },
.probe = armada_370_pinctrl_probe, .probe = armada_370_pinctrl_probe,
.remove = __devexit_p(armada_370_pinctrl_remove), .remove = armada_370_pinctrl_remove,
}; };
module_platform_driver(armada_370_pinctrl_driver); module_platform_driver(armada_370_pinctrl_driver);

8
drivers/pinctrl/mvebu/pinctrl-armada-xp.c
View File

@ -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 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", .compatible = "marvell,mv78230-pinctrl",
.data = (void *) V_MV78230, .data = (void *) V_MV78230,
@ -394,7 +394,7 @@ static struct pinctrl_gpio_range mv78460_mpp_gpio_ranges[] = {
MPP_GPIO_RANGE(2, 64, 64, 3), 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; struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info;
const struct of_device_id *match = 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); 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); 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), .of_match_table = of_match_ptr(armada_xp_pinctrl_of_match),
}, },
.probe = armada_xp_pinctrl_probe, .probe = armada_xp_pinctrl_probe,
.remove = __devexit_p(armada_xp_pinctrl_remove), .remove = armada_xp_pinctrl_remove,
}; };
module_platform_driver(armada_xp_pinctrl_driver); module_platform_driver(armada_xp_pinctrl_driver);

8
drivers/pinctrl/mvebu/pinctrl-dove.c
View File

@ -579,12 +579,12 @@ static struct mvebu_pinctrl_soc_info dove_pinctrl_info = {
static struct clk *clk; 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 }, { .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 = const struct of_device_id *match =
of_match_device(dove_pinctrl_of_match, &pdev->dev); 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); 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; int ret;
@ -618,7 +618,7 @@ static struct platform_driver dove_pinctrl_driver = {
.of_match_table = of_match_ptr(dove_pinctrl_of_match), .of_match_table = of_match_ptr(dove_pinctrl_of_match),
}, },
.probe = dove_pinctrl_probe, .probe = dove_pinctrl_probe,
.remove = __devexit_p(dove_pinctrl_remove), .remove = dove_pinctrl_remove,
}; };
module_platform_driver(dove_pinctrl_driver); module_platform_driver(dove_pinctrl_driver);

8
drivers/pinctrl/mvebu/pinctrl-kirkwood.c
View File

@ -444,7 +444,7 @@ static struct mvebu_pinctrl_soc_info mv98dx4122_info = {
.ngpioranges = ARRAY_SIZE(mv88f628x_gpio_ranges), .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,88f6180-pinctrl", .data = &mv88f6180_info },
{ .compatible = "marvell,88f6190-pinctrl", .data = &mv88f6190_info }, { .compatible = "marvell,88f6190-pinctrl", .data = &mv88f6190_info },
{ .compatible = "marvell,88f6192-pinctrl", .data = &mv88f6192_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 = const struct of_device_id *match =
of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); 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); 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); 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), .of_match_table = of_match_ptr(kirkwood_pinctrl_of_match),
}, },
.probe = kirkwood_pinctrl_probe, .probe = kirkwood_pinctrl_probe,
.remove = __devexit_p(kirkwood_pinctrl_remove), .remove = kirkwood_pinctrl_remove,
}; };
module_platform_driver(kirkwood_pinctrl_driver); module_platform_driver(kirkwood_pinctrl_driver);

11
drivers/pinctrl/mvebu/pinctrl-mvebu.c
View File

@ -478,8 +478,7 @@ static struct pinctrl_ops mvebu_pinctrl_ops = {
.dt_free_map = mvebu_pinctrl_dt_free_map, .dt_free_map = mvebu_pinctrl_dt_free_map,
}; };
static int __devinit _add_function(struct mvebu_pinctrl_function *funcs, static int _add_function(struct mvebu_pinctrl_function *funcs, const char *name)
const char *name)
{ {
while (funcs->num_groups) { while (funcs->num_groups) {
/* function already there */ /* function already there */
@ -494,8 +493,8 @@ static int __devinit _add_function(struct mvebu_pinctrl_function *funcs,
return 0; 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 *pctl)
{ {
struct mvebu_pinctrl_function *funcs; struct mvebu_pinctrl_function *funcs;
int num = 0; int num = 0;
@ -568,7 +567,7 @@ static int __devinit mvebu_pinctrl_build_functions(struct platform_device *pdev,
return 0; 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 mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -745,7 +744,7 @@ int __devinit mvebu_pinctrl_probe(struct platform_device *pdev)
return 0; 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); struct mvebu_pinctrl *pctl = platform_get_drvdata(pdev);
pinctrl_unregister(pctl->pctldev); pinctrl_unregister(pctl->pctldev);

37
drivers/pinctrl/pinctrl-at91.c
View File

@ -792,8 +792,8 @@ static struct pinctrl_desc at91_pinctrl_desc = {
static const char *gpio_compat = "atmel,at91rm9200-gpio"; static const char *gpio_compat = "atmel,at91rm9200-gpio";
static void __devinit at91_pinctrl_child_count(struct at91_pinctrl *info, static void at91_pinctrl_child_count(struct at91_pinctrl *info,
struct device_node *np) struct device_node *np)
{ {
struct device_node *child; struct device_node *child;
@ -807,8 +807,8 @@ static void __devinit at91_pinctrl_child_count(struct at91_pinctrl *info,
} }
} }
static int __devinit at91_pinctrl_mux_mask(struct at91_pinctrl *info, static int at91_pinctrl_mux_mask(struct at91_pinctrl *info,
struct device_node *np) struct device_node *np)
{ {
int ret = 0; int ret = 0;
int size; int size;
@ -840,10 +840,9 @@ static int __devinit at91_pinctrl_mux_mask(struct at91_pinctrl *info,
return ret; return ret;
} }
static int __devinit at91_pinctrl_parse_groups(struct device_node *np, static int at91_pinctrl_parse_groups(struct device_node *np,
struct at91_pin_group *grp, struct at91_pin_group *grp,
struct at91_pinctrl *info, struct at91_pinctrl *info, u32 index)
u32 index)
{ {
struct at91_pmx_pin *pin; struct at91_pmx_pin *pin;
int size; int size;
@ -889,8 +888,8 @@ static int __devinit at91_pinctrl_parse_groups(struct device_node *np,
return 0; return 0;
} }
static int __devinit at91_pinctrl_parse_functions(struct device_node *np, static int at91_pinctrl_parse_functions(struct device_node *np,
struct at91_pinctrl *info, u32 index) struct at91_pinctrl *info, u32 index)
{ {
struct device_node *child; struct device_node *child;
struct at91_pmx_func *func; struct at91_pmx_func *func;
@ -926,14 +925,14 @@ static int __devinit at91_pinctrl_parse_functions(struct device_node *np,
return 0; return 0;
} }
static struct of_device_id at91_pinctrl_of_match[] __devinitdata = { static struct of_device_id at91_pinctrl_of_match[] = {
{ .compatible = "atmel,at91sam9x5-pinctrl", .data = &at91sam9x5_ops }, { .compatible = "atmel,at91sam9x5-pinctrl", .data = &at91sam9x5_ops },
{ .compatible = "atmel,at91rm9200-pinctrl", .data = &at91rm9200_ops }, { .compatible = "atmel,at91rm9200-pinctrl", .data = &at91rm9200_ops },
{ /* sentinel */ } { /* sentinel */ }
}; };
static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev, static int at91_pinctrl_probe_dt(struct platform_device *pdev,
struct at91_pinctrl *info) struct at91_pinctrl *info)
{ {
int ret = 0; int ret = 0;
int i, j; int i, j;
@ -999,7 +998,7 @@ static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit at91_pinctrl_probe(struct platform_device *pdev) static int at91_pinctrl_probe(struct platform_device *pdev)
{ {
struct at91_pinctrl *info; struct at91_pinctrl *info;
struct pinctrl_pin_desc *pdesc; struct pinctrl_pin_desc *pdesc;
@ -1063,7 +1062,7 @@ err:
return ret; return ret;
} }
static int __devexit at91_pinctrl_remove(struct platform_device *pdev) static int at91_pinctrl_remove(struct platform_device *pdev)
{ {
struct at91_pinctrl *info = platform_get_drvdata(pdev); struct at91_pinctrl *info = platform_get_drvdata(pdev);
@ -1443,7 +1442,7 @@ static struct gpio_chip at91_gpio_template = {
.ngpio = MAX_NB_GPIO_PER_BANK, .ngpio = MAX_NB_GPIO_PER_BANK,
}; };
static void __devinit at91_gpio_probe_fixup(void) static void at91_gpio_probe_fixup(void)
{ {
unsigned i; unsigned i;
struct at91_gpio_chip *at91_gpio, *last = NULL; struct at91_gpio_chip *at91_gpio, *last = NULL;
@ -1461,13 +1460,13 @@ static void __devinit at91_gpio_probe_fixup(void)
} }
} }
static struct of_device_id at91_gpio_of_match[] __devinitdata = { static struct of_device_id at91_gpio_of_match[] = {
{ .compatible = "atmel,at91sam9x5-gpio", .data = &at91sam9x5_ops, }, { .compatible = "atmel,at91sam9x5-gpio", .data = &at91sam9x5_ops, },
{ .compatible = "atmel,at91rm9200-gpio", .data = &at91rm9200_ops }, { .compatible = "atmel,at91rm9200-gpio", .data = &at91rm9200_ops },
{ /* sentinel */ } { /* sentinel */ }
}; };
static int __devinit at91_gpio_probe(struct platform_device *pdev) static int at91_gpio_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct resource *res; struct resource *res;
@ -1609,7 +1608,7 @@ static struct platform_driver at91_pinctrl_driver = {
.of_match_table = of_match_ptr(at91_pinctrl_of_match), .of_match_table = of_match_ptr(at91_pinctrl_of_match),
}, },
.probe = at91_pinctrl_probe, .probe = at91_pinctrl_probe,
.remove = __devexit_p(at91_pinctrl_remove), .remove = at91_pinctrl_remove,
}; };
static int __init at91_pinctrl_init(void) static int __init at91_pinctrl_init(void)

2
drivers/pinctrl/pinctrl-bcm2835.c
View File

@ -936,7 +936,7 @@ static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range = {
.npins = BCM2835_NUM_GPIOS, .npins = BCM2835_NUM_GPIOS,
}; };
static int __devinit bcm2835_pinctrl_probe(struct platform_device *pdev) static int bcm2835_pinctrl_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;

2
drivers/pinctrl/pinctrl-exynos5440.c
View File

@ -842,7 +842,7 @@ static int __init exynos5440_gpiolib_unregister(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit exynos5440_pinctrl_probe(struct platform_device *pdev) static int exynos5440_pinctrl_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct exynos5440_pinctrl_priv_data *priv; struct exynos5440_pinctrl_priv_data *priv;

19
drivers/pinctrl/pinctrl-imx.c
View File

@ -425,10 +425,10 @@ static int imx_pinctrl_get_pin_id_and_mux(const struct imx_pinctrl_soc_info *inf
return 0; return 0;
} }
static int __devinit imx_pinctrl_parse_groups(struct device_node *np, static int imx_pinctrl_parse_groups(struct device_node *np,
struct imx_pin_group *grp, struct imx_pin_group *grp,
struct imx_pinctrl_soc_info *info, struct imx_pinctrl_soc_info *info,
u32 index) u32 index)
{ {
unsigned int pin_func_id; unsigned int pin_func_id;
int ret, size; int ret, size;
@ -482,8 +482,9 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np,
return 0; return 0;
} }
static int __devinit imx_pinctrl_parse_functions(struct device_node *np, static int imx_pinctrl_parse_functions(struct device_node *np,
struct imx_pinctrl_soc_info *info, u32 index) struct imx_pinctrl_soc_info *info,
u32 index)
{ {
struct device_node *child; struct device_node *child;
struct imx_pmx_func *func; struct imx_pmx_func *func;
@ -517,7 +518,7 @@ static int __devinit imx_pinctrl_parse_functions(struct device_node *np,
return 0; return 0;
} }
static int __devinit imx_pinctrl_probe_dt(struct platform_device *pdev, static int imx_pinctrl_probe_dt(struct platform_device *pdev,
struct imx_pinctrl_soc_info *info) struct imx_pinctrl_soc_info *info)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -560,8 +561,8 @@ static int __devinit imx_pinctrl_probe_dt(struct platform_device *pdev,
return 0; return 0;
} }
int __devinit imx_pinctrl_probe(struct platform_device *pdev, int imx_pinctrl_probe(struct platform_device *pdev,
struct imx_pinctrl_soc_info *info) struct imx_pinctrl_soc_info *info)
{ {
struct imx_pinctrl *ipctl; struct imx_pinctrl *ipctl;
struct resource *res; struct resource *res;

2
drivers/pinctrl/pinctrl-imx23.c
View File

@ -267,7 +267,7 @@ static struct mxs_pinctrl_soc_data imx23_pinctrl_data = {
.npins = ARRAY_SIZE(imx23_pins), .npins = ARRAY_SIZE(imx23_pins),
}; };
static int __devinit imx23_pinctrl_probe(struct platform_device *pdev) static int imx23_pinctrl_probe(struct platform_device *pdev)
{ {
return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data); return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data);
} }

2
drivers/pinctrl/pinctrl-imx28.c
View File

@ -383,7 +383,7 @@ static struct mxs_pinctrl_soc_data imx28_pinctrl_data = {
.npins = ARRAY_SIZE(imx28_pins), .npins = ARRAY_SIZE(imx28_pins),
}; };
static int __devinit imx28_pinctrl_probe(struct platform_device *pdev) static int imx28_pinctrl_probe(struct platform_device *pdev)
{ {
return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data); return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data);
} }

2
drivers/pinctrl/pinctrl-imx35.c
View File

@ -1564,7 +1564,7 @@ static struct of_device_id imx35_pinctrl_of_match[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
static int __devinit imx35_pinctrl_probe(struct platform_device *pdev) static int imx35_pinctrl_probe(struct platform_device *pdev)
{ {
return imx_pinctrl_probe(pdev, &imx35_pinctrl_info); return imx_pinctrl_probe(pdev, &imx35_pinctrl_info);
} }

2
drivers/pinctrl/pinctrl-imx51.c
View File

@ -1291,7 +1291,7 @@ static struct of_device_id imx51_pinctrl_of_match[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
static int __devinit imx51_pinctrl_probe(struct platform_device *pdev) static int imx51_pinctrl_probe(struct platform_device *pdev)
{ {
return imx_pinctrl_probe(pdev, &imx51_pinctrl_info); return imx_pinctrl_probe(pdev, &imx51_pinctrl_info);
} }

2
drivers/pinctrl/pinctrl-imx53.c
View File

@ -1618,7 +1618,7 @@ static struct of_device_id imx53_pinctrl_of_match[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
static int __devinit imx53_pinctrl_probe(struct platform_device *pdev) static int imx53_pinctrl_probe(struct platform_device *pdev)
{ {
return imx_pinctrl_probe(pdev, &imx53_pinctrl_info); return imx_pinctrl_probe(pdev, &imx53_pinctrl_info);
} }

2
drivers/pinctrl/pinctrl-imx6q.c
View File

@ -2302,7 +2302,7 @@ static struct of_device_id imx6q_pinctrl_of_match[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
static int __devinit imx6q_pinctrl_probe(struct platform_device *pdev) static int imx6q_pinctrl_probe(struct platform_device *pdev)
{ {
return imx_pinctrl_probe(pdev, &imx6q_pinctrl_info); return imx_pinctrl_probe(pdev, &imx6q_pinctrl_info);
} }

2
drivers/pinctrl/pinctrl-mmp2.c
View File

@ -686,7 +686,7 @@ static struct pxa3xx_pinmux_info mmp2_info = {
.ds_shift = MMP2_DS_SHIFT, .ds_shift = MMP2_DS_SHIFT,
}; };
static int __devinit mmp2_pinmux_probe(struct platform_device *pdev) static int mmp2_pinmux_probe(struct platform_device *pdev)
{ {
return pxa3xx_pinctrl_register(pdev, &mmp2_info); return pxa3xx_pinctrl_register(pdev, &mmp2_info);
} }

14
drivers/pinctrl/pinctrl-mxs.c
View File

@ -335,9 +335,9 @@ static struct pinctrl_desc mxs_pinctrl_desc = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __devinit mxs_pinctrl_parse_group(struct platform_device *pdev, static int mxs_pinctrl_parse_group(struct platform_device *pdev,
struct device_node *np, int idx, struct device_node *np, int idx,
const char **out_name) const char **out_name)
{ {
struct mxs_pinctrl_data *d = platform_get_drvdata(pdev); struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);
struct mxs_group *g = &d->soc->groups[idx]; struct mxs_group *g = &d->soc->groups[idx];
@ -384,8 +384,8 @@ static int __devinit mxs_pinctrl_parse_group(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev, static int mxs_pinctrl_probe_dt(struct platform_device *pdev,
struct mxs_pinctrl_data *d) struct mxs_pinctrl_data *d)
{ {
struct mxs_pinctrl_soc_data *soc = d->soc; struct mxs_pinctrl_soc_data *soc = d->soc;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -476,8 +476,8 @@ static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev,
return 0; return 0;
} }
int __devinit mxs_pinctrl_probe(struct platform_device *pdev, int mxs_pinctrl_probe(struct platform_device *pdev,
struct mxs_pinctrl_soc_data *soc) struct mxs_pinctrl_soc_data *soc)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct mxs_pinctrl_data *d; struct mxs_pinctrl_data *d;

3
drivers/pinctrl/pinctrl-nomadik-db8500.c
View File

@ -1251,8 +1251,7 @@ static const struct nmk_pinctrl_soc_data nmk_db8500_soc = {
.prcm_gpiocr_registers = db8500_prcm_gpiocr_regs, .prcm_gpiocr_registers = db8500_prcm_gpiocr_regs,
}; };
void __devinit void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc)
nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc)
{ {
*soc = &nmk_db8500_soc; *soc = &nmk_db8500_soc;
} }

3
drivers/pinctrl/pinctrl-nomadik-db8540.c
View File

@ -1260,8 +1260,7 @@ static const struct nmk_pinctrl_soc_data nmk_db8540_soc = {
.prcm_gpiocr_registers = db8540_prcm_gpiocr_regs, .prcm_gpiocr_registers = db8540_prcm_gpiocr_regs,
}; };
void __devinit void nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc)
nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc)
{ {
*soc = &nmk_db8540_soc; *soc = &nmk_db8540_soc;
} }

3
drivers/pinctrl/pinctrl-nomadik-stn8815.c
View File

@ -350,8 +350,7 @@ static const struct nmk_pinctrl_soc_data nmk_stn8815_soc = {
.ngroups = ARRAY_SIZE(nmk_stn8815_groups), .ngroups = ARRAY_SIZE(nmk_stn8815_groups),
}; };
void __devinit void nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)
{ {
*soc = &nmk_stn8815_soc; *soc = &nmk_stn8815_soc;
} }

4
drivers/pinctrl/pinctrl-nomadik.c
View File

@ -1306,7 +1306,7 @@ const struct irq_domain_ops nmk_gpio_irq_simple_ops = {
.xlate = irq_domain_xlate_twocell, .xlate = irq_domain_xlate_twocell,
}; };
static int __devinit nmk_gpio_probe(struct platform_device *dev) static int nmk_gpio_probe(struct platform_device *dev)
{ {
struct nmk_gpio_platform_data *pdata = dev->dev.platform_data; struct nmk_gpio_platform_data *pdata = dev->dev.platform_data;
struct device_node *np = dev->dev.of_node; struct device_node *np = dev->dev.of_node;
@ -1846,7 +1846,7 @@ static const struct of_device_id nmk_pinctrl_match[] = {
{}, {},
}; };
static int __devinit nmk_pinctrl_probe(struct platform_device *pdev) static int nmk_pinctrl_probe(struct platform_device *pdev)
{ {
const struct platform_device_id *platid = platform_get_device_id(pdev); const struct platform_device_id *platid = platform_get_device_id(pdev);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;

2
drivers/pinctrl/pinctrl-pxa168.c
View File

@ -615,7 +615,7 @@ static struct pxa3xx_pinmux_info pxa168_info = {
.ds_shift = PXA168_DS_SHIFT, .ds_shift = PXA168_DS_SHIFT,
}; };
static int __devinit pxa168_pinmux_probe(struct platform_device *pdev) static int pxa168_pinmux_probe(struct platform_device *pdev)
{ {
return pxa3xx_pinctrl_register(pdev, &pxa168_info); return pxa3xx_pinctrl_register(pdev, &pxa168_info);
} }

2
drivers/pinctrl/pinctrl-pxa910.c
View File

@ -971,7 +971,7 @@ static struct pxa3xx_pinmux_info pxa910_info = {
.ds_shift = PXA910_DS_SHIFT, .ds_shift = PXA910_DS_SHIFT,
}; };
static int __devinit pxa910_pinmux_probe(struct platform_device *pdev) static int pxa910_pinmux_probe(struct platform_device *pdev)
{ {
return pxa3xx_pinctrl_register(pdev, &pxa910_info); return pxa3xx_pinctrl_register(pdev, &pxa910_info);
} }

26
drivers/pinctrl/pinctrl-samsung.c
View File

@ -549,9 +549,11 @@ static int samsung_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
* Parse the pin names listed in the 'samsung,pins' property and convert it * Parse the pin names listed in the 'samsung,pins' property and convert it
* into a list of gpio numbers are create a pin group from it. * into a list of gpio numbers are create a pin group from it.
*/ */
static int __devinit samsung_pinctrl_parse_dt_pins(struct platform_device *pdev, static int samsung_pinctrl_parse_dt_pins(struct platform_device *pdev,
struct device_node *cfg_np, struct pinctrl_desc *pctl, struct device_node *cfg_np,
unsigned int **pin_list, unsigned int *npins) struct pinctrl_desc *pctl,
unsigned int **pin_list,
unsigned int *npins)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct property *prop; struct property *prop;
@ -596,8 +598,8 @@ static int __devinit samsung_pinctrl_parse_dt_pins(struct platform_device *pdev,
* from device node of the pin-controller. A pin group is formed with all * from device node of the pin-controller. A pin group is formed with all
* the pins listed in the "samsung,pins" property. * the pins listed in the "samsung,pins" property.
*/ */
static int __devinit samsung_pinctrl_parse_dt(struct platform_device *pdev, static int samsung_pinctrl_parse_dt(struct platform_device *pdev,
struct samsung_pinctrl_drv_data *drvdata) struct samsung_pinctrl_drv_data *drvdata)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *dev_np = dev->of_node; struct device_node *dev_np = dev->of_node;
@ -691,8 +693,8 @@ static int __devinit samsung_pinctrl_parse_dt(struct platform_device *pdev,
} }
/* register the pinctrl interface with the pinctrl subsystem */ /* register the pinctrl interface with the pinctrl subsystem */
static int __devinit samsung_pinctrl_register(struct platform_device *pdev, static int samsung_pinctrl_register(struct platform_device *pdev,
struct samsung_pinctrl_drv_data *drvdata) struct samsung_pinctrl_drv_data *drvdata)
{ {
struct pinctrl_desc *ctrldesc = &drvdata->pctl; struct pinctrl_desc *ctrldesc = &drvdata->pctl;
struct pinctrl_pin_desc *pindesc, *pdesc; struct pinctrl_pin_desc *pindesc, *pdesc;
@ -778,8 +780,8 @@ static const struct gpio_chip samsung_gpiolib_chip = {
}; };
/* register the gpiolib interface with the gpiolib subsystem */ /* register the gpiolib interface with the gpiolib subsystem */
static int __devinit samsung_gpiolib_register(struct platform_device *pdev, static int samsung_gpiolib_register(struct platform_device *pdev,
struct samsung_pinctrl_drv_data *drvdata) struct samsung_pinctrl_drv_data *drvdata)
{ {
struct samsung_pin_ctrl *ctrl = drvdata->ctrl; struct samsung_pin_ctrl *ctrl = drvdata->ctrl;
struct samsung_pin_bank *bank = ctrl->pin_banks; struct samsung_pin_bank *bank = ctrl->pin_banks;
@ -816,8 +818,8 @@ fail:
} }
/* unregister the gpiolib interface with the gpiolib subsystem */ /* unregister the gpiolib interface with the gpiolib subsystem */
static int __devinit samsung_gpiolib_unregister(struct platform_device *pdev, static int samsung_gpiolib_unregister(struct platform_device *pdev,
struct samsung_pinctrl_drv_data *drvdata) struct samsung_pinctrl_drv_data *drvdata)
{ {
struct samsung_pin_ctrl *ctrl = drvdata->ctrl; struct samsung_pin_ctrl *ctrl = drvdata->ctrl;
struct samsung_pin_bank *bank = ctrl->pin_banks; struct samsung_pin_bank *bank = ctrl->pin_banks;
@ -881,7 +883,7 @@ static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data(
return ctrl; return ctrl;
} }
static int __devinit samsung_pinctrl_probe(struct platform_device *pdev) static int samsung_pinctrl_probe(struct platform_device *pdev)
{ {
struct samsung_pinctrl_drv_data *drvdata; struct samsung_pinctrl_drv_data *drvdata;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;

9
drivers/pinctrl/pinctrl-single.c
View File

@ -493,7 +493,7 @@ static struct pinconf_ops pcs_pinconf_ops = {
* @pcs: pcs driver instance * @pcs: pcs driver instance
* @offset: register offset from base * @offset: register offset from base
*/ */
static int __devinit pcs_add_pin(struct pcs_device *pcs, unsigned offset) static int pcs_add_pin(struct pcs_device *pcs, unsigned offset)
{ {
struct pinctrl_pin_desc *pin; struct pinctrl_pin_desc *pin;
struct pcs_name *pn; struct pcs_name *pn;
@ -526,7 +526,7 @@ static int __devinit pcs_add_pin(struct pcs_device *pcs, unsigned offset)
* If your hardware needs holes in the address space, then just set * If your hardware needs holes in the address space, then just set
* up multiple driver instances. * up multiple driver instances.
*/ */
static int __devinit pcs_allocate_pin_table(struct pcs_device *pcs) static int pcs_allocate_pin_table(struct pcs_device *pcs)
{ {
int mux_bytes, nr_pins, i; int mux_bytes, nr_pins, i;
@ -907,8 +907,7 @@ static void pcs_free_resources(struct pcs_device *pcs)
static struct of_device_id pcs_of_match[]; static struct of_device_id pcs_of_match[];
static int __devinit pcs_add_gpio_range(struct device_node *node, static int pcs_add_gpio_range(struct device_node *node, struct pcs_device *pcs)
struct pcs_device *pcs)
{ {
struct pcs_gpio_range *gpio; struct pcs_gpio_range *gpio;
struct device_node *child; struct device_node *child;
@ -951,7 +950,7 @@ static int __devinit pcs_add_gpio_range(struct device_node *node,
return 0; return 0;
} }
static int __devinit pcs_probe(struct platform_device *pdev) static int pcs_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct of_device_id *match; const struct of_device_id *match;

4
drivers/pinctrl/pinctrl-sirf.c
View File

@ -1246,7 +1246,7 @@ static void __iomem *sirfsoc_rsc_of_iomap(void)
return of_iomap(np, 0); return of_iomap(np, 0);
} }
static int __devinit sirfsoc_pinmux_probe(struct platform_device *pdev) static int sirfsoc_pinmux_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct sirfsoc_pmx *spmx; struct sirfsoc_pmx *spmx;
@ -1663,7 +1663,7 @@ const struct irq_domain_ops sirfsoc_gpio_irq_simple_ops = {
.xlate = irq_domain_xlate_twocell, .xlate = irq_domain_xlate_twocell,
}; };
static int __devinit sirfsoc_gpio_probe(struct device_node *np) static int sirfsoc_gpio_probe(struct device_node *np)
{ {
int i, err = 0; int i, err = 0;
struct sirfsoc_gpio_bank *bank; struct sirfsoc_gpio_bank *bank;

2
drivers/pinctrl/pinctrl-tegra.c
View File

@ -687,7 +687,7 @@ static struct pinctrl_desc tegra_pinctrl_desc = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
int __devinit tegra_pinctrl_probe(struct platform_device *pdev, int tegra_pinctrl_probe(struct platform_device *pdev,
const struct tegra_pinctrl_soc_data *soc_data) const struct tegra_pinctrl_soc_data *soc_data)
{ {
struct tegra_pmx *pmx; struct tegra_pmx *pmx;

2
drivers/pinctrl/pinctrl-tegra20.c
View File

@ -2856,7 +2856,7 @@ static const struct tegra_pinctrl_soc_data tegra20_pinctrl = {
.ngroups = ARRAY_SIZE(tegra20_groups), .ngroups = ARRAY_SIZE(tegra20_groups),
}; };
static int __devinit tegra20_pinctrl_probe(struct platform_device *pdev) static int tegra20_pinctrl_probe(struct platform_device *pdev)
{ {
return tegra_pinctrl_probe(pdev, &tegra20_pinctrl); return tegra_pinctrl_probe(pdev, &tegra20_pinctrl);
} }

2
drivers/pinctrl/pinctrl-tegra30.c
View File

@ -3722,7 +3722,7 @@ static const struct tegra_pinctrl_soc_data tegra30_pinctrl = {
.ngroups = ARRAY_SIZE(tegra30_groups), .ngroups = ARRAY_SIZE(tegra30_groups),
}; };
static int __devinit tegra30_pinctrl_probe(struct platform_device *pdev) static int tegra30_pinctrl_probe(struct platform_device *pdev)
{ {
return tegra_pinctrl_probe(pdev, &tegra30_pinctrl); return tegra_pinctrl_probe(pdev, &tegra30_pinctrl);
} }

2
drivers/pinctrl/pinctrl-u300.c
View File

@ -1062,7 +1062,7 @@ static struct pinctrl_desc u300_pmx_desc = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __devinit u300_pmx_probe(struct platform_device *pdev) static int u300_pmx_probe(struct platform_device *pdev)
{ {
struct u300_pmx *upmx; struct u300_pmx *upmx;
struct resource *res; struct resource *res;

2
drivers/pinctrl/pinctrl-xway.c
View File

@ -674,7 +674,7 @@ static const struct of_device_id xway_match[] = {
}; };
MODULE_DEVICE_TABLE(of, xway_match); MODULE_DEVICE_TABLE(of, xway_match);
static int __devinit pinmux_xway_probe(struct platform_device *pdev) static int pinmux_xway_probe(struct platform_device *pdev)
{ {
const struct of_device_id *match; const struct of_device_id *match;
const struct pinctrl_xway_soc *xway_soc; const struct pinctrl_xway_soc *xway_soc;

5
drivers/pinctrl/spear/pinctrl-plgpio.c
View File

@ -451,8 +451,7 @@ int spear310_o2p(int offset)
return offset + 2; return offset + 2;
} }
static int __devinit plgpio_probe_dt(struct platform_device *pdev, static int plgpio_probe_dt(struct platform_device *pdev, struct plgpio *plgpio)
struct plgpio *plgpio)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
int ret = -EINVAL; int ret = -EINVAL;
@ -522,7 +521,7 @@ static int __devinit plgpio_probe_dt(struct platform_device *pdev,
end: end:
return ret; return ret;
} }
static int __devinit plgpio_probe(struct platform_device *pdev) static int plgpio_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct plgpio *plgpio; struct plgpio *plgpio;

11
drivers/pinctrl/spear/pinctrl-spear.c
View File

@ -82,9 +82,8 @@ static int set_mode(struct spear_pmx *pmx, int mode)
return 0; return 0;
} }
void __devinit void pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup,
pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, unsigned count, u16 reg)
unsigned count, u16 reg)
{ {
int i, j; int i, j;
@ -93,7 +92,7 @@ pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup,
gpio_pingroup[i].muxregs[j].reg = reg; gpio_pingroup[i].muxregs[j].reg = reg;
} }
void __devinit pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg) void pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg)
{ {
struct spear_pingroup *pgroup; struct spear_pingroup *pgroup;
struct spear_modemux *modemux; struct spear_modemux *modemux;
@ -358,8 +357,8 @@ static struct pinctrl_desc spear_pinctrl_desc = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
int __devinit spear_pinctrl_probe(struct platform_device *pdev, int spear_pinctrl_probe(struct platform_device *pdev,
struct spear_pinctrl_machdata *machdata) struct spear_pinctrl_machdata *machdata)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct resource *res; struct resource *res;

11
drivers/pinctrl/spear/pinctrl-spear.h
View File

@ -192,12 +192,11 @@ static inline void pmx_writel(struct spear_pmx *pmx, u32 val, u32 reg)
writel_relaxed(val, pmx->vbase + reg); writel_relaxed(val, pmx->vbase + reg);
} }
void __devinit pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg); void pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg);
void __devinit void pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup,
pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, unsigned count, u16 reg);
unsigned count, u16 reg); int spear_pinctrl_probe(struct platform_device *pdev,
int __devinit spear_pinctrl_probe(struct platform_device *pdev, struct spear_pinctrl_machdata *machdata);
struct spear_pinctrl_machdata *machdata);
int spear_pinctrl_remove(struct platform_device *pdev); int spear_pinctrl_remove(struct platform_device *pdev);
#define SPEAR_PIN_0_TO_101 \ #define SPEAR_PIN_0_TO_101 \

2
drivers/pinctrl/spear/pinctrl-spear1310.c
View File

@ -2699,7 +2699,7 @@ static struct of_device_id spear1310_pinctrl_of_match[] = {
{}, {},
}; };
static int __devinit spear1310_pinctrl_probe(struct platform_device *pdev) static int spear1310_pinctrl_probe(struct platform_device *pdev)
{ {
return spear_pinctrl_probe(pdev, &spear1310_machdata); return spear_pinctrl_probe(pdev, &spear1310_machdata);
} }

2
drivers/pinctrl/spear/pinctrl-spear1340.c
View File

@ -2015,7 +2015,7 @@ static struct of_device_id spear1340_pinctrl_of_match[] = {
{}, {},
}; };
static int __devinit spear1340_pinctrl_probe(struct platform_device *pdev) static int spear1340_pinctrl_probe(struct platform_device *pdev)
{ {
return spear_pinctrl_probe(pdev, &spear1340_machdata); return spear_pinctrl_probe(pdev, &spear1340_machdata);
} }

2
drivers/pinctrl/spear/pinctrl-spear300.c
View File

@ -653,7 +653,7 @@ static struct of_device_id spear300_pinctrl_of_match[] = {
{}, {},
}; };
static int __devinit spear300_pinctrl_probe(struct platform_device *pdev) static int spear300_pinctrl_probe(struct platform_device *pdev)
{ {
int ret; int ret;

2
drivers/pinctrl/spear/pinctrl-spear310.c
View File

@ -378,7 +378,7 @@ static struct of_device_id spear310_pinctrl_of_match[] = {
{}, {},
}; };
static int __devinit spear310_pinctrl_probe(struct platform_device *pdev) static int spear310_pinctrl_probe(struct platform_device *pdev)
{ {
int ret; int ret;

2
drivers/pinctrl/spear/pinctrl-spear320.c
View File

@ -3417,7 +3417,7 @@ static struct of_device_id spear320_pinctrl_of_match[] = {
{}, {},
}; };
static int __devinit spear320_pinctrl_probe(struct platform_device *pdev) static int spear320_pinctrl_probe(struct platform_device *pdev)
{ {
int ret; int ret;