diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 23:16:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 23:16:08 +0100 |
| commit | e4f61eeb1747ec7fa524a8f704b103a27d0f15ae (patch) | |
| tree | 6d02c6cedf52de42a85299b16d65730403b4d062 | |
| parent | 7410bf1b69a73b75dbbf9126593db4adcbd989a6 (diff) | |
| parent | 6580566e10016c1ec00aa5e0e62af3c4b3498019 (diff) | |
Merge tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux into next/soc
Merge "Broadcom soc changes for 4.6" from Florian Fainelli:
This pull request contains Broadcom ARM-based SoC/platform changes:
- Masahiro updates the Broadcom Northstar Plus SMP operations to be annotated
with const and __initconst
- Florian removes an unused variable in the Broadcom BCM63XX SMP code
* tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux:
ARM: BCM63xx: Remove unused pmb_dn variable
ARM: bcm: use const and __initconst for smp_operations
| -rw-r--r-- | arch/arm/mach-bcm/bcm63xx_pmb.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-bcm/platsmp.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm/bcm63xx_pmb.c b/arch/arm/mach-bcm/bcm63xx_pmb.c index de061ec5a479..41dcf5d65630 100644 --- a/arch/arm/mach-bcm/bcm63xx_pmb.c +++ b/arch/arm/mach-bcm/bcm63xx_pmb.c @@ -92,7 +92,6 @@ static int bcm63xx_pmb_get_resources(struct device_node *dn, unsigned int *cpu, unsigned int *addr) { - struct device_node *pmb_dn; struct of_phandle_args args; int ret; @@ -109,7 +108,6 @@ static int bcm63xx_pmb_get_resources(struct device_node *dn, return ret; } - pmb_dn = args.np; if (args.args_count != 2) { pr_err("reset-controller does not conform to reset-cells\n"); return -EINVAL; diff --git a/arch/arm/mach-bcm/platsmp.c b/arch/arm/mach-bcm/platsmp.c index 575defcc53f9..cfae9c71fb74 100644 --- a/arch/arm/mach-bcm/platsmp.c +++ b/arch/arm/mach-bcm/platsmp.c @@ -283,7 +283,7 @@ static const struct smp_operations bcm_smp_ops __initconst = { CPU_METHOD_OF_DECLARE(bcm_smp_bcm281xx, "brcm,bcm11351-cpu-method", &bcm_smp_ops); -struct smp_operations nsp_smp_ops __initdata = { +static const struct smp_operations nsp_smp_ops __initconst = { .smp_prepare_cpus = bcm_smp_prepare_cpus, .smp_boot_secondary = nsp_boot_secondary, }; |