| Message ID | 1348868177-21205-4-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 28, 2012 at 10:36 PM, Arnd Bergmann <arnd@arndb.de> wrote: > The MODULE_DEVICE_TABLE() entry in the dw_mmc_exynos driver > points to the wrong symbol which results in a link error > when building as a loadable module. > > Further, we get a warning about the driver_data being > marked constant, which requires annotating a few pointers > as const. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Chris Ball <cjb@laptop.org> > Cc: Thomas Abraham <thomas.abraham@linaro.org> > Cc: Will Newton <will.newton@imgtec.com> > Cc: Jaehoon Chung <jh80.chung@samsung.com> > Cc: Seungwon Jeon <tgih.jun@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: linux-mmc@vger.kernel.org > --- > drivers/mmc/host/dw_mmc-exynos.c | 4 ++-- > drivers/mmc/host/dw_mmc-pltfm.c | 2 +- > drivers/mmc/host/dw_mmc-pltfm.h | 2 +- > drivers/mmc/host/dw_mmc.c | 2 +- > include/linux/mmc/dw_mmc.h | 2 +- > 5 files changed, 6 insertions(+), 6 deletions(-) This looks ok to me, but I'll let one of the Exynos guys ack those specific changes as I don't have the hardware. There's already a patch for the dev_info warning in dw_mmc.c frm Seungwon Jeon, and it seems to me like a separate change but I don't really mind how it gets merged.
Monday, October 01, 2012, Will Newton <will.newton@gmail.com> wrote: > On Fri, Sep 28, 2012 at 10:36 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > The MODULE_DEVICE_TABLE() entry in the dw_mmc_exynos driver > > points to the wrong symbol which results in a link error > > when building as a loadable module. > > > > Further, we get a warning about the driver_data being > > marked constant, which requires annotating a few pointers > > as const. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Cc: Chris Ball <cjb@laptop.org> > > Cc: Thomas Abraham <thomas.abraham@linaro.org> > > Cc: Will Newton <will.newton@imgtec.com> > > Cc: Jaehoon Chung <jh80.chung@samsung.com> > > Cc: Seungwon Jeon <tgih.jun@samsung.com> > > Cc: Kyungmin Park <kyungmin.park@samsung.com> > > Cc: linux-mmc@vger.kernel.org > > --- > > drivers/mmc/host/dw_mmc-exynos.c | 4 ++-- > > drivers/mmc/host/dw_mmc-pltfm.c | 2 +- > > drivers/mmc/host/dw_mmc-pltfm.h | 2 +- > > drivers/mmc/host/dw_mmc.c | 2 +- > > include/linux/mmc/dw_mmc.h | 2 +- > > 5 files changed, 6 insertions(+), 6 deletions(-) > > This looks ok to me, but I'll let one of the Exynos guys ack those > specific changes as I don't have the hardware. > > There's already a patch for the dev_info warning in dw_mmc.c frm > Seungwon Jeon, and it seems to me like a separate change but I don't > really mind how it gets merged. Looks good to me. I don't mind it about including 'dev_info warning'. Acked-by: Seungwon Jeon<tgih.jun@samsung.com> > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index 660bbc5..32109a6 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -223,11 +223,11 @@ static const struct of_device_id dw_mci_exynos_match[] = { .data = (void *)&exynos5250_drv_data, }, {}, }; -MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match); +MODULE_DEVICE_TABLE(of, dw_mci_exynos_match); int dw_mci_exynos_probe(struct platform_device *pdev) { - struct dw_mci_drv_data *drv_data; + const struct dw_mci_drv_data *drv_data; const struct of_device_id *match; match = of_match_node(dw_mci_exynos_match, pdev->dev.of_node); diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index c960ca7..5e33156 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -24,7 +24,7 @@ #include "dw_mmc.h" int dw_mci_pltfm_register(struct platform_device *pdev, - struct dw_mci_drv_data *drv_data) + const struct dw_mci_drv_data *drv_data) { struct dw_mci *host; struct resource *regs; diff --git a/drivers/mmc/host/dw_mmc-pltfm.h b/drivers/mmc/host/dw_mmc-pltfm.h index 301f245..2ac37b8 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.h +++ b/drivers/mmc/host/dw_mmc-pltfm.h @@ -13,7 +13,7 @@ #define _DW_MMC_PLTFM_H_ extern int dw_mci_pltfm_register(struct platform_device *pdev, - struct dw_mci_drv_data *drv_data); + const struct dw_mci_drv_data *drv_data); extern int __devexit dw_mci_pltfm_remove(struct platform_device *pdev); extern const struct dev_pm_ops dw_mci_pltfm_pmops; diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index a23af77..026cf92 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1973,7 +1973,7 @@ static void dw_mci_init_dma(struct dw_mci *host) /* Determine which DMA interface to use */ #ifdef CONFIG_MMC_DW_IDMAC host->dma_ops = &dw_mci_idmac_ops; - dev_info(&host->dev, "Using internal DMA controller.\n"); + dev_info(host->dev, "Using internal DMA controller.\n"); #endif if (!host->dma_ops) diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7c6a113..0f62c8c 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -162,7 +162,7 @@ struct dw_mci { u16 data_offset; struct device *dev; struct dw_mci_board *pdata; - struct dw_mci_drv_data *drv_data; + const struct dw_mci_drv_data *drv_data; void *priv; struct clk *biu_clk; struct clk *ciu_clk;
The MODULE_DEVICE_TABLE() entry in the dw_mmc_exynos driver points to the wrong symbol which results in a link error when building as a loadable module. Further, we get a warning about the driver_data being marked constant, which requires annotating a few pointers as const. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Chris Ball <cjb@laptop.org> Cc: Thomas Abraham <thomas.abraham@linaro.org> Cc: Will Newton <will.newton@imgtec.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Seungwon Jeon <tgih.jun@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: linux-mmc@vger.kernel.org --- drivers/mmc/host/dw_mmc-exynos.c | 4 ++-- drivers/mmc/host/dw_mmc-pltfm.c | 2 +- drivers/mmc/host/dw_mmc-pltfm.h | 2 +- drivers/mmc/host/dw_mmc.c | 2 +- include/linux/mmc/dw_mmc.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)