Skip to content

Commit

Permalink
Drivers: pinctrl: remove __dev* attributes.
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Greg Kroah-Hartman committed Jan 3, 2013
1 parent 5a167f4 commit 150632b
Show file tree
Hide file tree
Showing 39 changed files with 114 additions and 120 deletions.
8 changes: 4 additions & 4 deletions drivers/pinctrl/mvebu/pinctrl-armada-370.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
{ },
};
Expand All @@ -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;

Expand All @@ -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);
}
Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions drivers/pinctrl/mvebu/pinctrl-armada-xp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions drivers/pinctrl/mvebu/pinctrl-dove.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;

Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions drivers/pinctrl/mvebu/pinctrl-kirkwood.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -454,15 +454,15 @@ 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);
pdev->dev.platform_data = match->data;
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);
}
Expand All @@ -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);
Expand Down
11 changes: 5 additions & 6 deletions drivers/pinctrl/mvebu/pinctrl-mvebu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -494,8 +493,8 @@ static int __devinit _add_function(struct mvebu_pinctrl_function *funcs,
return 0;
}

static int __devinit mvebu_pinctrl_build_functions(struct platform_device *pdev,
struct mvebu_pinctrl *pctl)
static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
struct mvebu_pinctrl *pctl)
{
struct mvebu_pinctrl_function *funcs;
int num = 0;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
37 changes: 18 additions & 19 deletions drivers/pinctrl/pinctrl-at91.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,8 +792,8 @@ static struct pinctrl_desc at91_pinctrl_desc = {

static const char *gpio_compat = "atmel,at91rm9200-gpio";

static void __devinit at91_pinctrl_child_count(struct at91_pinctrl *info,
struct device_node *np)
static void at91_pinctrl_child_count(struct at91_pinctrl *info,
struct device_node *np)
{
struct device_node *child;

Expand All @@ -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,
struct device_node *np)
static int at91_pinctrl_mux_mask(struct at91_pinctrl *info,
struct device_node *np)
{
int ret = 0;
int size;
Expand Down Expand Up @@ -840,10 +840,9 @@ static int __devinit at91_pinctrl_mux_mask(struct at91_pinctrl *info,
return ret;
}

static int __devinit at91_pinctrl_parse_groups(struct device_node *np,
struct at91_pin_group *grp,
struct at91_pinctrl *info,
u32 index)
static int at91_pinctrl_parse_groups(struct device_node *np,
struct at91_pin_group *grp,
struct at91_pinctrl *info, u32 index)
{
struct at91_pmx_pin *pin;
int size;
Expand Down Expand Up @@ -889,8 +888,8 @@ static int __devinit at91_pinctrl_parse_groups(struct device_node *np,
return 0;
}

static int __devinit at91_pinctrl_parse_functions(struct device_node *np,
struct at91_pinctrl *info, u32 index)
static int at91_pinctrl_parse_functions(struct device_node *np,
struct at91_pinctrl *info, u32 index)
{
struct device_node *child;
struct at91_pmx_func *func;
Expand Down Expand Up @@ -926,14 +925,14 @@ static int __devinit at91_pinctrl_parse_functions(struct device_node *np,
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,at91rm9200-pinctrl", .data = &at91rm9200_ops },
{ /* sentinel */ }
};

static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev,
struct at91_pinctrl *info)
static int at91_pinctrl_probe_dt(struct platform_device *pdev,
struct at91_pinctrl *info)
{
int ret = 0;
int i, j;
Expand Down Expand Up @@ -999,7 +998,7 @@ static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev,
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 pinctrl_pin_desc *pdesc;
Expand Down Expand Up @@ -1063,7 +1062,7 @@ static int __devinit at91_pinctrl_probe(struct platform_device *pdev)
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);

Expand Down Expand Up @@ -1443,7 +1442,7 @@ static struct gpio_chip at91_gpio_template = {
.ngpio = MAX_NB_GPIO_PER_BANK,
};

static void __devinit at91_gpio_probe_fixup(void)
static void at91_gpio_probe_fixup(void)
{
unsigned i;
struct at91_gpio_chip *at91_gpio, *last = NULL;
Expand All @@ -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,at91rm9200-gpio", .data = &at91rm9200_ops },
{ /* 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 resource *res;
Expand Down Expand Up @@ -1609,7 +1608,7 @@ static struct platform_driver at91_pinctrl_driver = {
.of_match_table = of_match_ptr(at91_pinctrl_of_match),
},
.probe = at91_pinctrl_probe,
.remove = __devexit_p(at91_pinctrl_remove),
.remove = at91_pinctrl_remove,
};

static int __init at91_pinctrl_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/pinctrl-bcm2835.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range = {
.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_node *np = dev->of_node;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/pinctrl-exynos5440.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ static int __init exynos5440_gpiolib_unregister(struct platform_device *pdev,
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 exynos5440_pinctrl_priv_data *priv;
Expand Down
19 changes: 10 additions & 9 deletions drivers/pinctrl/pinctrl-imx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,10 @@ static int imx_pinctrl_get_pin_id_and_mux(const struct imx_pinctrl_soc_info *inf
return 0;
}

static int __devinit imx_pinctrl_parse_groups(struct device_node *np,
struct imx_pin_group *grp,
struct imx_pinctrl_soc_info *info,
u32 index)
static int imx_pinctrl_parse_groups(struct device_node *np,
struct imx_pin_group *grp,
struct imx_pinctrl_soc_info *info,
u32 index)
{
unsigned int pin_func_id;
int ret, size;
Expand Down Expand Up @@ -482,8 +482,9 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np,
return 0;
}

static int __devinit imx_pinctrl_parse_functions(struct device_node *np,
struct imx_pinctrl_soc_info *info, u32 index)
static int imx_pinctrl_parse_functions(struct device_node *np,
struct imx_pinctrl_soc_info *info,
u32 index)
{
struct device_node *child;
struct imx_pmx_func *func;
Expand Down Expand Up @@ -517,7 +518,7 @@ static int __devinit imx_pinctrl_parse_functions(struct device_node *np,
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 device_node *np = pdev->dev.of_node;
Expand Down Expand Up @@ -560,8 +561,8 @@ static int __devinit imx_pinctrl_probe_dt(struct platform_device *pdev,
return 0;
}

int __devinit imx_pinctrl_probe(struct platform_device *pdev,
struct imx_pinctrl_soc_info *info)
int imx_pinctrl_probe(struct platform_device *pdev,
struct imx_pinctrl_soc_info *info)
{
struct imx_pinctrl *ipctl;
struct resource *res;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/pinctrl-imx23.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static struct mxs_pinctrl_soc_data imx23_pinctrl_data = {
.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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/pinctrl-imx28.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static struct mxs_pinctrl_soc_data imx28_pinctrl_data = {
.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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/pinctrl-imx35.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ static struct of_device_id imx35_pinctrl_of_match[] = {
{ /* 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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/pinctrl-imx51.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ static struct of_device_id imx51_pinctrl_of_match[] = {
{ /* 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);
}
Expand Down
Loading

0 comments on commit 150632b

Please sign in to comment.