Re: [PATCH] omap2: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both

2017-09-19 Thread Tony Lindgren 
* H. Nikolaus Schaller  [170918 13:34]:
> Hi Tony,
> is still there on 4.14-rc1.

Applying into omap-for-v4.14/fixes thanks.

Tony

Re: [PATCH] omap2: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both

2017-09-19 Thread Tony Lindgren 
* H. Nikolaus Schaller  [170918 13:34]:
> Hi Tony,
> is still there on 4.14-rc1.

Applying into omap-for-v4.14/fixes thanks.

Tony

Re: [PATCH] omap2: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both

2017-09-18 Thread H. Nikolaus Schaller 
Hi Tony,
is still there on 4.14-rc1.

BR,
Nikolaus

> Am 08.09.2017 um 21:15 schrieb H. Nikolaus Schaller :
> 
> With 4.13 kernel I get this boot message:
> 
> [1.051727] [ cut here ]
> [1.051818] WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:31 
> sysfs_warn_dup+0x54/0x74
> [1.051849] sysfs: cannot create duplicate filename 
> '/devices/platform/omap_hsmmc.2'
> [1.051879] Modules linked in:
> [1.051971] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.13.0-letux+ #1360
> [1.052001] Hardware name: Generic OMAP3 (Flattened Device Tree)
> [1.052062] [] (unwind_backtrace) from [] 
> (show_stack+0x10/0x14)
> [1.052124] [] (show_stack) from [] 
> (dump_stack+0x98/0xd0)
> [1.052185] [] (dump_stack) from [] (__warn+0xd0/0x100)
> [1.052215] [] (__warn) from [] 
> (warn_slowpath_fmt+0x34/0x44)
> [1.052276] [] (warn_slowpath_fmt) from [] 
> (sysfs_warn_dup+0x54/0x74)
> [1.052337] [] (sysfs_warn_dup) from [] 
> (sysfs_create_dir_ns+0x74/0x84)
> [1.052398] [] (sysfs_create_dir_ns) from [] 
> (kobject_add_internal+0xd0/0x294)
> [1.052429] [] (kobject_add_internal) from [] 
> (kobject_add+0x6c/0x8c)
> [1.052490] [] (kobject_add) from [] 
> (device_add+0xe4/0x510)
> [1.052551] [] (device_add) from [] 
> (platform_device_add+0x130/0x1c0)
> [1.052612] [] (platform_device_add) from [] 
> (omap_hsmmc_late_init+0x3c/0x60)
> [1.052673] [] (omap_hsmmc_late_init) from [] 
> (omap3_pandora_legacy_init+0x24/0xb4)
> [1.052734] [] (omap3_pandora_legacy_init) from [] 
> (pdata_quirks_check+0x30/0x3c)
> [1.052795] [] (pdata_quirks_check) from [] 
> (omap_generic_init+0xc/0x18)
> [1.052856] [] (omap_generic_init) from [] 
> (customize_machine+0x1c/0x28)
> [1.052917] [] (customize_machine) from [] 
> (do_one_initcall+0xa8/0x150)
> [1.052947] [] (do_one_initcall) from [] 
> (kernel_init_freeable+0x110/0x1d4)
> [1.053009] [] (kernel_init_freeable) from [] 
> (kernel_init+0x8/0x10c)
> [1.053070] [] (kernel_init) from [] 
> (ret_from_fork+0x14/0x24)
> [1.055023] ---[ end trace 44e490b09ac4ab88 ]---
> 
> This can be traced down to the calls of
> 
>   omap_hsmmc_init(pandora_mmc3);
>   omap_hsmmc_late_init(pandora_mmc3);
> 
> in omap3_pandora_legacy_init().
> 
> It turns out that both funcions disagree how to decide if the other one was 
> alredy called.
> 
> Signed-off-by: H. Nikolaus Schaller 
> ---
> arch/arm/mach-omap2/hsmmc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
> index 5b614388d72f..6d28aa20a7d3 100644
> --- a/arch/arm/mach-omap2/hsmmc.c
> +++ b/arch/arm/mach-omap2/hsmmc.c
> @@ -58,10 +58,10 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
>   struct platform_device *pdev;
>   int res;
> 
> - if (omap_hsmmc_done != 1)
> + if (omap_hsmmc_done)
>   return;
> 
> - omap_hsmmc_done++;
> + omap_hsmmc_done = 1;
> 
>   for (; c->mmc; c++) {
>   pdev = c->pdev;
> -- 
> 2.12.2
>

Re: [PATCH] omap2: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both

2017-09-18 Thread H. Nikolaus Schaller 
Hi Tony,
is still there on 4.14-rc1.

BR,
Nikolaus

> Am 08.09.2017 um 21:15 schrieb H. Nikolaus Schaller :
> 
> With 4.13 kernel I get this boot message:
> 
> [1.051727] [ cut here ]
> [1.051818] WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:31 
> sysfs_warn_dup+0x54/0x74
> [1.051849] sysfs: cannot create duplicate filename 
> '/devices/platform/omap_hsmmc.2'
> [1.051879] Modules linked in:
> [1.051971] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.13.0-letux+ #1360
> [1.052001] Hardware name: Generic OMAP3 (Flattened Device Tree)
> [1.052062] [] (unwind_backtrace) from [] 
> (show_stack+0x10/0x14)
> [1.052124] [] (show_stack) from [] 
> (dump_stack+0x98/0xd0)
> [1.052185] [] (dump_stack) from [] (__warn+0xd0/0x100)
> [1.052215] [] (__warn) from [] 
> (warn_slowpath_fmt+0x34/0x44)
> [1.052276] [] (warn_slowpath_fmt) from [] 
> (sysfs_warn_dup+0x54/0x74)
> [1.052337] [] (sysfs_warn_dup) from [] 
> (sysfs_create_dir_ns+0x74/0x84)
> [1.052398] [] (sysfs_create_dir_ns) from [] 
> (kobject_add_internal+0xd0/0x294)
> [1.052429] [] (kobject_add_internal) from [] 
> (kobject_add+0x6c/0x8c)
> [1.052490] [] (kobject_add) from [] 
> (device_add+0xe4/0x510)
> [1.052551] [] (device_add) from [] 
> (platform_device_add+0x130/0x1c0)
> [1.052612] [] (platform_device_add) from [] 
> (omap_hsmmc_late_init+0x3c/0x60)
> [1.052673] [] (omap_hsmmc_late_init) from [] 
> (omap3_pandora_legacy_init+0x24/0xb4)
> [1.052734] [] (omap3_pandora_legacy_init) from [] 
> (pdata_quirks_check+0x30/0x3c)
> [1.052795] [] (pdata_quirks_check) from [] 
> (omap_generic_init+0xc/0x18)
> [1.052856] [] (omap_generic_init) from [] 
> (customize_machine+0x1c/0x28)
> [1.052917] [] (customize_machine) from [] 
> (do_one_initcall+0xa8/0x150)
> [1.052947] [] (do_one_initcall) from [] 
> (kernel_init_freeable+0x110/0x1d4)
> [1.053009] [] (kernel_init_freeable) from [] 
> (kernel_init+0x8/0x10c)
> [1.053070] [] (kernel_init) from [] 
> (ret_from_fork+0x14/0x24)
> [1.055023] ---[ end trace 44e490b09ac4ab88 ]---
> 
> This can be traced down to the calls of
> 
>   omap_hsmmc_init(pandora_mmc3);
>   omap_hsmmc_late_init(pandora_mmc3);
> 
> in omap3_pandora_legacy_init().
> 
> It turns out that both funcions disagree how to decide if the other one was 
> alredy called.
> 
> Signed-off-by: H. Nikolaus Schaller 
> ---
> arch/arm/mach-omap2/hsmmc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
> index 5b614388d72f..6d28aa20a7d3 100644
> --- a/arch/arm/mach-omap2/hsmmc.c
> +++ b/arch/arm/mach-omap2/hsmmc.c
> @@ -58,10 +58,10 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
>   struct platform_device *pdev;
>   int res;
> 
> - if (omap_hsmmc_done != 1)
> + if (omap_hsmmc_done)
>   return;
> 
> - omap_hsmmc_done++;
> + omap_hsmmc_done = 1;
> 
>   for (; c->mmc; c++) {
>   pdev = c->pdev;
> -- 
> 2.12.2
>