Re: [PATCH v2 07/11] omap: remove old hsmmc.[ch] and in Makefile
- Trimmed cc-list (could be a good idea for next submission as well) On Mon, 21 Oct 2019 at 19:11, Tony Lindgren wrote: > > * H. Nikolaus Schaller [191021 17:08]: > > > > > Am 21.10.2019 um 16:30 schrieb Tony Lindgren : > > > > > > * H. Nikolaus Schaller [191019 18:43]: > > >> --- a/arch/arm/mach-omap2/Makefile > > >> +++ b/arch/arm/mach-omap2/Makefile > > >> @@ -216,7 +216,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += > > >> board-n8x0.o > > >> > > >> # Platform specific device init code > > >> > > >> -omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o > > >> obj-y += $(omap-hsmmc-m) > > >> $(omap-hsmmc-y) > > > > > > The related obj-y line can go now too, right? > > > > Yes, I think so. It is a construction that I have never seen before :) > > Therefore I did not recognize that it is related. > > > > > And looks like common.h also has struct omap2_hsmmc_info > > > so maybe check by grepping for hsmmc_info to see it's gone. > > > > Yes, it is just a forward-declaration of the struct name with > > no user anywhere. > > > > Scheduled for v3. > > > > BTW: should this series go through your tree since it is an > > omap machine? > > Or MMC tree as that's where the code change really are. I am okay with that. I will have a look at the series and provide some comments. Kind regards Uffe
Re: [PATCH v2 07/11] omap: remove old hsmmc.[ch] and in Makefile
* H. Nikolaus Schaller [191021 17:08]: > > > Am 21.10.2019 um 16:30 schrieb Tony Lindgren : > > > > * H. Nikolaus Schaller [191019 18:43]: > >> --- a/arch/arm/mach-omap2/Makefile > >> +++ b/arch/arm/mach-omap2/Makefile > >> @@ -216,7 +216,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o > >> > >> # Platform specific device init code > >> > >> -omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o > >> obj-y += $(omap-hsmmc-m) > >> $(omap-hsmmc-y) > > > > The related obj-y line can go now too, right? > > Yes, I think so. It is a construction that I have never seen before :) > Therefore I did not recognize that it is related. > > > And looks like common.h also has struct omap2_hsmmc_info > > so maybe check by grepping for hsmmc_info to see it's gone. > > Yes, it is just a forward-declaration of the struct name with > no user anywhere. > > Scheduled for v3. > > BTW: should this series go through your tree since it is an > omap machine? Or MMC tree as that's where the code change really are. Regards, Tony
Re: [PATCH v2 07/11] omap: remove old hsmmc.[ch] and in Makefile
> Am 21.10.2019 um 16:30 schrieb Tony Lindgren : > > * H. Nikolaus Schaller [191019 18:43]: >> --- a/arch/arm/mach-omap2/Makefile >> +++ b/arch/arm/mach-omap2/Makefile >> @@ -216,7 +216,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0)+= board-n8x0.o >> >> # Platform specific device init code >> >> -omap-hsmmc-$(CONFIG_MMC_OMAP_HS):= hsmmc.o >> obj-y+= $(omap-hsmmc-m) >> $(omap-hsmmc-y) > > The related obj-y line can go now too, right? Yes, I think so. It is a construction that I have never seen before :) Therefore I did not recognize that it is related. > And looks like common.h also has struct omap2_hsmmc_info > so maybe check by grepping for hsmmc_info to see it's gone. Yes, it is just a forward-declaration of the struct name with no user anywhere. Scheduled for v3. BTW: should this series go through your tree since it is an omap machine? BR and thanks, Nikolaus
Re: [PATCH v2 07/11] omap: remove old hsmmc.[ch] and in Makefile
* H. Nikolaus Schaller [191019 18:43]: > --- a/arch/arm/mach-omap2/Makefile > +++ b/arch/arm/mach-omap2/Makefile > @@ -216,7 +216,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o > > # Platform specific device init code > > -omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o > obj-y+= $(omap-hsmmc-m) > $(omap-hsmmc-y) The related obj-y line can go now too, right? And looks like common.h also has struct omap2_hsmmc_info so maybe check by grepping for hsmmc_info to see it's gone. Regards, Tony
[PATCH v2 07/11] omap: remove old hsmmc.[ch] and in Makefile
There is a new one in drivers/mmc/host/omap_hsmmc.c
configured by CONFIG_MMC_OMAP_HS and the last user
was the pdata-quirks for pandora.
Suggested-by: Tony Lindgren
Signed-off-by: H. Nikolaus Schaller
---
arch/arm/mach-omap2/Makefile | 1 -
arch/arm/mach-omap2/hsmmc.c| 171 -
arch/arm/mach-omap2/hsmmc.h| 32 --
arch/arm/mach-omap2/pdata-quirks.c | 1 -
4 files changed, 205 deletions(-)
delete mode 100644 arch/arm/mach-omap2/hsmmc.c
delete mode 100644 arch/arm/mach-omap2/hsmmc.h
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8f208197988f..1b3062f32899 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -216,7 +216,6 @@ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
# Platform specific device init code
-omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o
obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y)
obj-y += omap_phy_internal.o
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
deleted file mode 100644
index 63423ea6a240..
--- a/arch/arm/mach-omap2/hsmmc.c
+++ /dev/null
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * linux/arch/arm/mach-omap2/hsmmc.c
- *
- * Copyright (C) 2007-2008 Texas Instruments
- * Copyright (C) 2008 Nokia Corporation
- * Author: Texas Instruments
- */
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "soc.h"
-#include "omap_device.h"
-
-#include "hsmmc.h"
-#include "control.h"
-
-#if IS_ENABLED(CONFIG_MMC_OMAP_HS)
-
-static u16 control_pbias_offset;
-static u16 control_devconf1_offset;
-
-#define HSMMC_NAME_LEN 9
-
-static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
- struct omap_hsmmc_platform_data *mmc)
-{
- char *hc_name;
-
- hc_name = kzalloc(HSMMC_NAME_LEN + 1, GFP_KERNEL);
- if (!hc_name)
- return -ENOMEM;
-
- snprintf(hc_name, (HSMMC_NAME_LEN + 1), "mmc%islot%i", c->mmc, 1);
- mmc->name = hc_name;
- mmc->caps = c->caps;
- mmc->reg_offset = 0;
-
- return 0;
-}
-
-static int omap_hsmmc_done;
-
-void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
-{
- struct platform_device *pdev;
- int res;
-
- if (omap_hsmmc_done)
- return;
-
- omap_hsmmc_done = 1;
-
- for (; c->mmc; c++) {
- pdev = c->pdev;
- if (!pdev)
- continue;
- res = omap_device_register(pdev);
- if (res)
- pr_err("Could not late init MMC\n");
- }
-}
-
-#define MAX_OMAP_MMC_HWMOD_NAME_LEN16
-
-static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo,
- int ctrl_nr)
-{
- struct omap_hwmod *oh;
- struct omap_hwmod *ohs[1];
- struct omap_device *od;
- struct platform_device *pdev;
- char oh_name[MAX_OMAP_MMC_HWMOD_NAME_LEN];
- struct omap_hsmmc_platform_data *mmc_data;
- struct omap_hsmmc_dev_attr *mmc_dev_attr;
- char *name;
- int res;
-
- mmc_data = kzalloc(sizeof(*mmc_data), GFP_KERNEL);
- if (!mmc_data)
- return;
-
- res = omap_hsmmc_pdata_init(hsmmcinfo, mmc_data);
- if (res < 0)
- goto free_mmc;
-
- name = "omap_hsmmc";
- res = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN,
-"mmc%d", ctrl_nr);
- WARN(res >= MAX_OMAP_MMC_HWMOD_NAME_LEN,
-"String buffer overflow in MMC%d device setup\n", ctrl_nr);
-
- oh = omap_hwmod_lookup(oh_name);
- if (!oh) {
- pr_err("Could not look up %s\n", oh_name);
- goto free_name;
- }
- ohs[0] = oh;
- if (oh->dev_attr != NULL) {
- mmc_dev_attr = oh->dev_attr;
- mmc_data->controller_flags = mmc_dev_attr->flags;
- }
-
- pdev = platform_device_alloc(name, ctrl_nr - 1);
- if (!pdev) {
- pr_err("Could not allocate pdev for %s\n", name);
- goto free_name;
- }
- dev_set_name(>dev, "%s.%d", pdev->name, pdev->id);
-
- od = omap_device_alloc(pdev, ohs, 1);
- if (IS_ERR(od)) {
- pr_err("Could not allocate od for %s\n", name);
- goto put_pdev;
- }
-
- res = platform_device_add_data(pdev, mmc_data,
- sizeof(struct omap_hsmmc_platform_data));
- if (res) {
- pr_err("Could not add pdata for %s\n", name);
- goto put_pdev;
- }
-
- hsmmcinfo->pdev = pdev;
-
- res = omap_device_register(pdev);
- if (res) {
- pr_err("Could not register od for %s\n", name);
- goto free_od;
- }
-
- goto free_mmc;
-
-free_od:
-
