Message ID | 1375915199-13694-1-git-send-email-markus.mayer@linaro.org |
---|---|
State | Accepted |
Commit | 058feb53666f8ca1f4b838227a9efae13801b861 |
Headers | show |
On 13-08-07 03:39 PM, Markus Mayer wrote: > This change makes the following build warning go away: > [...] > LINK vmlinux > LD vmlinux.o > MODPOST vmlinux.o > WARNING: modpost: Found 2 section mismatch(es). > To see full details build your kernel with: > 'make CONFIG_DEBUG_SECTION_MISMATCH=y' > > Signed-off-by: Markus Mayer <markus.mayer@linaro.org> > Reviewed-by: Christian Daudt <csd@broadcom.com> > Reviewed-by: Matt Porter <matt.porter@linaro.org> > --- > drivers/mmc/host/sdhci-bcm-kona.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c > index 87175f9..34fd652 100644 > --- a/drivers/mmc/host/sdhci-bcm-kona.c > +++ b/drivers/mmc/host/sdhci-bcm-kona.c > @@ -221,13 +221,13 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { > SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, > }; > > -static const struct of_device_id sdhci_bcm_kona_of_match[] __initdata = { > +static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { > { .compatible = "bcm,kona-sdhci"}, > {} > }; > MODULE_DEVICE_TABLE(of, sdhci_bcm_kona_of_match); > > -static int __init sdhci_bcm_kona_probe(struct platform_device *pdev) > +static int sdhci_bcm_kona_probe(struct platform_device *pdev) > { > struct sdhci_bcm_kona_dev *kona_dev = NULL; > struct sdhci_pltfm_host *pltfm_priv; > @@ -336,10 +336,10 @@ static struct platform_driver sdhci_bcm_kona_driver = { > .name = "sdhci-kona", > .owner = THIS_MODULE, > .pm = SDHCI_PLTFM_PMOPS, > - .of_match_table = of_match_ptr(sdhci_bcm_kona_of_match), > + .of_match_table = sdhci_bcm_kona_of_match, > }, > .probe = sdhci_bcm_kona_probe, > - .remove = __exit_p(sdhci_bcm_kona_remove), > + .remove = sdhci_bcm_kona_remove, > }; > module_platform_driver(sdhci_bcm_kona_driver); > Applied to bcm/for-3.12/soc thanks, csd
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 87175f9..34fd652 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -221,13 +221,13 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, }; -static const struct of_device_id sdhci_bcm_kona_of_match[] __initdata = { +static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { { .compatible = "bcm,kona-sdhci"}, {} }; MODULE_DEVICE_TABLE(of, sdhci_bcm_kona_of_match); -static int __init sdhci_bcm_kona_probe(struct platform_device *pdev) +static int sdhci_bcm_kona_probe(struct platform_device *pdev) { struct sdhci_bcm_kona_dev *kona_dev = NULL; struct sdhci_pltfm_host *pltfm_priv; @@ -336,10 +336,10 @@ static struct platform_driver sdhci_bcm_kona_driver = { .name = "sdhci-kona", .owner = THIS_MODULE, .pm = SDHCI_PLTFM_PMOPS, - .of_match_table = of_match_ptr(sdhci_bcm_kona_of_match), + .of_match_table = sdhci_bcm_kona_of_match, }, .probe = sdhci_bcm_kona_probe, - .remove = __exit_p(sdhci_bcm_kona_remove), + .remove = sdhci_bcm_kona_remove, }; module_platform_driver(sdhci_bcm_kona_driver);