Skip to content

Commit

Permalink
power: constify of_device_id array
Browse files Browse the repository at this point in the history
of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick <fabf@skynet.be>

[for vexpress]
Acked-by: Sudeep Holla <sudeep.holla@arm.com>

Signed-off-by: Sebastian Reichel <sre@kernel.org>
  • Loading branch information
Fabian Frederick authored and Sebastian Reichel committed Mar 20, 2015
1 parent 039ab50 commit 8fb0885
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/power/charger-manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ static int cm_init_thermal_data(struct charger_manager *cm,
return ret;
}

static struct of_device_id charger_manager_match[] = {
static const struct of_device_id charger_manager_match[] = {
{
.compatible = "charger-manager",
},
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/at91-poweroff.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static int at91_poweroff_probe(struct platform_device *pdev)
return 0;
}

static struct of_device_id at91_poweroff_of_match[] = {
static const struct of_device_id at91_poweroff_of_match[] = {
{ .compatible = "atmel,at91sam9260-shdwc", },
{ .compatible = "atmel,at91sam9rl-shdwc", },
{ .compatible = "atmel,at91sam9x5-shdwc", },
Expand Down
4 changes: 2 additions & 2 deletions drivers/power/reset/at91-reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ static void __init at91_reset_status(struct platform_device *pdev)
pr_info("AT91: Starting after %s\n", reason);
}

static struct of_device_id at91_ramc_of_match[] = {
static const struct of_device_id at91_ramc_of_match[] = {
{ .compatible = "atmel,at91sam9260-sdramc", },
{ .compatible = "atmel,at91sam9g45-ddramc", },
{ .compatible = "atmel,sama5d3-ddramc", },
{ /* sentinel */ }
};

static struct of_device_id at91_reset_of_match[] = {
static const struct of_device_id at91_reset_of_match[] = {
{ .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart },
{ .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },
{ /* sentinel */ }
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/hisi-reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static int hisi_reboot_probe(struct platform_device *pdev)
return err;
}

static struct of_device_id hisi_reboot_of_match[] = {
static const struct of_device_id hisi_reboot_of_match[] = {
{ .compatible = "hisilicon,sysctrl" },
{}
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/keystone-reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static struct notifier_block rsctrl_restart_nb = {
.priority = 128,
};

static struct of_device_id rsctrl_of_match[] = {
static const struct of_device_id rsctrl_of_match[] = {
{.compatible = "ti,keystone-reset", },
{},
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/st-poweroff.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static struct notifier_block st_restart_nb = {
.priority = 192,
};

static struct of_device_id st_reset_of_match[] = {
static const struct of_device_id st_reset_of_match[] = {
{
.compatible = "st,stih415-restart",
.data = (void *)&stih415_reset,
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/syscon-reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static int syscon_reboot_probe(struct platform_device *pdev)
return err;
}

static struct of_device_id syscon_reboot_of_match[] = {
static const struct of_device_id syscon_reboot_of_match[] = {
{ .compatible = "syscon-reboot" },
{}
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/vexpress-poweroff.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show,

enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT };

static struct of_device_id vexpress_reset_of_match[] = {
static const struct of_device_id vexpress_reset_of_match[] = {
{
.compatible = "arm,vexpress-reset",
.data = (void *)FUNC_RESET,
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/reset/xgene-reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int xgene_reboot_probe(struct platform_device *pdev)
return err;
}

static struct of_device_id xgene_reboot_of_match[] = {
static const struct of_device_id xgene_reboot_of_match[] = {
{ .compatible = "apm,xgene-reboot" },
{}
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/power/tps65090-charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static int tps65090_charger_remove(struct platform_device *pdev)
return 0;
}

static struct of_device_id of_tps65090_charger_match[] = {
static const struct of_device_id of_tps65090_charger_match[] = {
{ .compatible = "ti,tps65090-charger", },
{ /* end */ }
};
Expand Down

0 comments on commit 8fb0885

Please sign in to comment.