Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
platform data", .set_pwr() callback is removed from platform data.
Thus, .set_pwr() is not used anymore. Also, this patch fixes
the following build error and warning.
drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializer
drivers/mfd/asic3.c:724:2: warning: initialization makes integer from pointer without a cast [enabled by default]
drivers/mfd/asic3.c:724:2: warning: (near initialization for 'asic3_mmc_data.capabilities' [enabled by default]
Signed-off-by: Jingoo Han <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Chris Ball <[email protected]>
---
drivers/mfd/asic3.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index fa22154..7a6f713 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -705,13 +705,6 @@ static struct mfd_cell asic3_cell_ds1wm = {
.resources = ds1wm_resources,
};
-static void asic3_mmc_pwr(struct platform_device *pdev, int state)
-{
- struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
-
- tmio_core_mmc_pwr(asic->tmio_cnf, 1 - asic->bus_shift, state);
-}
-
static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
{
struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
@@ -721,7 +714,6 @@ static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
static struct tmio_mmc_data asic3_mmc_data = {
.hclk = 24576000,
- .set_pwr = asic3_mmc_pwr,
.set_clk_div = asic3_mmc_clk_div,
};
--
1.7.10.4
Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
platform data", .set_pwr() callback is removed from platform data.
Thus, .set_pwr() is not used anymore. Also, this patch fixes
the following build error and warning.
drivers/mfd/t7l66xb.c:146:2: error: unknown field 'set_pwr' specified in initializer
drivers/mfd/t7l66xb.c:146:2: warning: initialization makes integer from pointer without a cast [enabled by default]
drivers/mfd/t7l66xb.c:146:2: warning: (near initialization for 't7166xb_mmc_data.capabilities' [enabled by default]
Signed-off-by: Jingoo Han <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Chris Ball <[email protected]>
---
drivers/mfd/t7l66xb.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 9e04a74..0ddb6a0 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -123,14 +123,6 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc)
return 0;
}
-static void t7l66xb_mmc_pwr(struct platform_device *mmc, int state)
-{
- struct platform_device *dev = to_platform_device(mmc->dev.parent);
- struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
-
- tmio_core_mmc_pwr(t7l66xb->scr + 0x200, 0, state);
-}
-
static void t7l66xb_mmc_clk_div(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
@@ -143,7 +135,6 @@ static void t7l66xb_mmc_clk_div(struct platform_device *mmc, int state)
static struct tmio_mmc_data t7166xb_mmc_data = {
.hclk = 24000000,
- .set_pwr = t7l66xb_mmc_pwr,
.set_clk_div = t7l66xb_mmc_clk_div,
};
--
1.7.10.4
Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
platform data", .set_pwr() callback is removed from platform data.
Thus, .set_pwr() is not used anymore. Also, this patch fixes
the following build error and warning.
drivers/mfd/tc6387xb.c:123:2: error: unknown field 'set_pwr' specified in initializer
drivers/mfd/tc6387xb.c:123:2: warning: initialization makes integer from pointer without a cast [enabled by default]
drivers/mfd/tc6387xb.c:123:2: warning: (near initialization for 'tc6387xb_mmc_data.capabilities' [enabled by default]
Signed-off-by: Jingoo Han <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Chris Ball <[email protected]>
---
drivers/mfd/tc6387xb.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index acd0f3a..001c1cf 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -78,14 +78,6 @@ static int tc6387xb_resume(struct platform_device *dev)
/*--------------------------------------------------------------------------*/
-static void tc6387xb_mmc_pwr(struct platform_device *mmc, int state)
-{
- struct platform_device *dev = to_platform_device(mmc->dev.parent);
- struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
-
- tmio_core_mmc_pwr(tc6387xb->scr + 0x200, 0, state);
-}
-
static void tc6387xb_mmc_clk_div(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
@@ -120,7 +112,6 @@ static int tc6387xb_mmc_disable(struct platform_device *mmc)
static struct tmio_mmc_data tc6387xb_mmc_data = {
.hclk = 24000000,
- .set_pwr = tc6387xb_mmc_pwr,
.set_clk_div = tc6387xb_mmc_clk_div,
};
--
1.7.10.4
Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
platform data", .set_pwr() callback is removed from platform data.
Thus, .set_pwr() is not used anymore. Also, this patch fixes
the following build error and warning.
drivers/mfd/tc6393xb.c:381:2: error: unknown field 'set_pwr' specified in initializer
drivers/mfd/tc6393xb.c:381:2: warning: initialization makes integer from pointer without a cast [enabled by default]
drivers/mfd/tc6393xb.c:381:2: warning: (near initialization for 'tc6393xb_mmc_data.capabilities' [enabled by default]
Signed-off-by: Jingoo Han <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Chris Ball <[email protected]>
---
drivers/mfd/tc6393xb.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 11c19e5..7c5c351 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -360,14 +360,6 @@ static int tc6393xb_mmc_resume(struct platform_device *mmc)
return 0;
}
-static void tc6393xb_mmc_pwr(struct platform_device *mmc, int state)
-{
- struct platform_device *dev = to_platform_device(mmc->dev.parent);
- struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
-
- tmio_core_mmc_pwr(tc6393xb->scr + 0x200, 0, state);
-}
-
static void tc6393xb_mmc_clk_div(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
@@ -378,7 +370,6 @@ static void tc6393xb_mmc_clk_div(struct platform_device *mmc, int state)
static struct tmio_mmc_data tc6393xb_mmc_data = {
.hclk = 24000000,
- .set_pwr = tc6393xb_mmc_pwr,
.set_clk_div = tc6393xb_mmc_clk_div,
};
--
1.7.10.4
tmio_core_mmc_pwr() is not called anymore, so remove it.
Signed-off-by: Jingoo Han <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Chris Ball <[email protected]>
---
drivers/mfd/tmio_core.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/mfd/tmio_core.c b/drivers/mfd/tmio_core.c
index 83af78c..1a28c85 100644
--- a/drivers/mfd/tmio_core.c
+++ b/drivers/mfd/tmio_core.c
@@ -39,12 +39,6 @@ int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base)
}
EXPORT_SYMBOL(tmio_core_mmc_resume);
-void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state)
-{
- sd_config_write8(cnf, shift, CNF_PWR_CTL_2, state ? 0x02 : 0x00);
-}
-EXPORT_SYMBOL(tmio_core_mmc_pwr);
-
void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state)
{
sd_config_write8(cnf, shift, CNF_SD_CLK_MODE, state ? 1 : 0);
--
1.7.10.4
On Wednesday, August 28, 2013 2:52 PM, Jingoo Han wrote:
>
> Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> platform data", .set_pwr() callback is removed from platform data.
> Thus, .set_pwr() is not used anymore. Also, this patch fixes
> the following build error and warning.
I made this patch based on linux-next tree.
However, commit 3af9d15 "mmc: tmio-mmc: Remove .set_pwr()
Callback from platform data" was merged to mmc-next tree.
Thus, how about merging these patchset through mmc-next tree
instead of mfd tree?
Best regards,
Jingoo Han
>
> drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializer
> drivers/mfd/asic3.c:724:2: warning: initialization makes integer from pointer without a cast [enabled
> by default]
> drivers/mfd/asic3.c:724:2: warning: (near initialization for 'asic3_mmc_data.capabilities' [enabled by
> default]
>
> Signed-off-by: Jingoo Han <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Guennadi Liakhovetski <[email protected]>
> Cc: Ian Molton <[email protected]>
> Cc: Chris Ball <[email protected]>
> ---
> drivers/mfd/asic3.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
> index fa22154..7a6f713 100644
> --- a/drivers/mfd/asic3.c
> +++ b/drivers/mfd/asic3.c
> @@ -705,13 +705,6 @@ static struct mfd_cell asic3_cell_ds1wm = {
> .resources = ds1wm_resources,
> };
>
> -static void asic3_mmc_pwr(struct platform_device *pdev, int state)
> -{
> - struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
> -
> - tmio_core_mmc_pwr(asic->tmio_cnf, 1 - asic->bus_shift, state);
> -}
> -
> static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
> {
> struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
> @@ -721,7 +714,6 @@ static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
>
> static struct tmio_mmc_data asic3_mmc_data = {
> .hclk = 24576000,
> - .set_pwr = asic3_mmc_pwr,
> .set_clk_div = asic3_mmc_clk_div,
> };
>
> --
> 1.7.10.4
Hi Jingoo,
Thank you for the patch.
On Wednesday 28 August 2013 14:52:16 Jingoo Han wrote:
> Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> platform data", .set_pwr() callback is removed from platform data.
> Thus, .set_pwr() is not used anymore. Also, this patch fixes
> the following build error and warning.
>
> drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
> initializer drivers/mfd/asic3.c:724:2: warning: initialization makes
> integer from pointer without a cast [enabled by default]
> drivers/mfd/asic3.c:724:2: warning: (near initialization for
> 'asic3_mmc_data.capabilities' [enabled by default]
My bad, it looks like I've overlooked a few users of the .set_pwr() field :-/
Sorry about that.
> Signed-off-by: Jingoo Han <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Guennadi Liakhovetski <[email protected]>
> Cc: Ian Molton <[email protected]>
> Cc: Chris Ball <[email protected]>
> ---
> drivers/mfd/asic3.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
> index fa22154..7a6f713 100644
> --- a/drivers/mfd/asic3.c
> +++ b/drivers/mfd/asic3.c
> @@ -705,13 +705,6 @@ static struct mfd_cell asic3_cell_ds1wm = {
> .resources = ds1wm_resources,
> };
>
> -static void asic3_mmc_pwr(struct platform_device *pdev, int state)
> -{
> - struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
> -
> - tmio_core_mmc_pwr(asic->tmio_cnf, 1 - asic->bus_shift, state);
> -}
> -
I don't think blindly removing the function is the right fix, as it seems to
be needed. Looking at the whole series, I believe we should just revert
3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
instead.
> static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
> {
> struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
> @@ -721,7 +714,6 @@ static void asic3_mmc_clk_div(struct platform_device
> *pdev, int state)
>
> static struct tmio_mmc_data asic3_mmc_data = {
> .hclk = 24576000,
> - .set_pwr = asic3_mmc_pwr,
> .set_clk_div = asic3_mmc_clk_div,
> };
--
Regards,
Laurent Pinchart
> > Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> > platform data", .set_pwr() callback is removed from platform data.
> > Thus, .set_pwr() is not used anymore. Also, this patch fixes
> > the following build error and warning.
>
> I made this patch based on linux-next tree.
>
> However, commit 3af9d15 "mmc: tmio-mmc: Remove .set_pwr()
> Callback from platform data" was merged to mmc-next tree.
>
> Thus, how about merging these patchset through mmc-next tree
> instead of mfd tree?
Ouch! No, I think that patch should be removed from -next and for the
remainder to be place in the correct order before re-submission. It's
probably best to split "mmc: tmio-mmc: Remove .set_pwr() Callback from
platform data" into two patches, applying the removal of void (*set_pwr)
last.
Does that sound okay to you Chris?
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
> > Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> > platform data", .set_pwr() callback is removed from platform data.
> > Thus, .set_pwr() is not used anymore. Also, this patch fixes
> > the following build error and warning.
> >
> > drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
> > initializer drivers/mfd/asic3.c:724:2: warning: initialization makes
> > integer from pointer without a cast [enabled by default]
> > drivers/mfd/asic3.c:724:2: warning: (near initialization for
> > 'asic3_mmc_data.capabilities' [enabled by default]
>
> My bad, it looks like I've overlooked a few users of the .set_pwr() field :-/
> Sorry about that.
<snip>
> I don't think blindly removing the function is the right fix, as it seems to
> be needed. Looking at the whole series, I believe we should just revert
> 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
> instead.
No need to revert it, as it's not in Mainline yet. Just request for it
to be removed from Chris' tree.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Hi Lee,
(Dropping Ian Molton <[email protected]> from the CC list as the e-
mail address isn't valid anymore)
On Wednesday 28 August 2013 08:41:26 Lee Jones wrote:
> > > Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> > > platform data", .set_pwr() callback is removed from platform data.
> > > Thus, .set_pwr() is not used anymore. Also, this patch fixes
> > > the following build error and warning.
> > >
> > > drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
> > > initializer drivers/mfd/asic3.c:724:2: warning: initialization makes
> > > integer from pointer without a cast [enabled by default]
> > > drivers/mfd/asic3.c:724:2: warning: (near initialization for
> > > 'asic3_mmc_data.capabilities' [enabled by default]
> >
> > My bad, it looks like I've overlooked a few users of the .set_pwr() field
> > :-/ Sorry about that.
>
> <snip>
>
> > I don't think blindly removing the function is the right fix, as it seems
> > to be needed. Looking at the whole series, I believe we should just
> > revert 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from platform
> > data" instead.
>
> No need to revert it, as it's not in Mainline yet. Just request for it
> to be removed from Chris' tree.
I spupose it depends on whether Chris has provided a stable branch with the
patch included. I'm fine with both, the commit just needs to be undone one way
or another.
--
Regards,
Laurent Pinchart
On Wed, Aug 28, 2013 at 12:51 AM, Laurent Pinchart
<[email protected]> wrote:
> Hi Lee,
>
> (Dropping Ian Molton <[email protected]> from the CC list as the e-
> mail address isn't valid anymore)
>
> On Wednesday 28 August 2013 08:41:26 Lee Jones wrote:
>> > > Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
>> > > platform data", .set_pwr() callback is removed from platform data.
>> > > Thus, .set_pwr() is not used anymore. Also, this patch fixes
>> > > the following build error and warning.
>> > >
>> > > drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
>> > > initializer drivers/mfd/asic3.c:724:2: warning: initialization makes
>> > > integer from pointer without a cast [enabled by default]
>> > > drivers/mfd/asic3.c:724:2: warning: (near initialization for
>> > > 'asic3_mmc_data.capabilities' [enabled by default]
>> >
>> > My bad, it looks like I've overlooked a few users of the .set_pwr() field
>> > :-/ Sorry about that.
>>
>> <snip>
>>
>> > I don't think blindly removing the function is the right fix, as it seems
>> > to be needed. Looking at the whole series, I believe we should just
>> > revert 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from platform
>> > data" instead.
>>
>> No need to revert it, as it's not in Mainline yet. Just request for it
>> to be removed from Chris' tree.
>
> I spupose it depends on whether Chris has provided a stable branch with the
> patch included. I'm fine with both, the commit just needs to be undone one way
> or another.
Any progress on this? linux-next builds are still failing for the
following defconfigs because of this removal:
Failed defconfigs:
arm-magician_defconfig
arm-eseries_pxa_defconfig
Errors:
arm-magician_defconfig
drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
initializer
arm-eseries_pxa_defconfig
drivers/mfd/t7l66xb.c:146:2: error: unknown field 'set_pwr' specified
in initializer
drivers/mfd/tc6387xb.c:123:2: error: unknown field 'set_pwr' specified
in initializer
drivers/mfd/tc6393xb.c:381:2: error: unknown field 'set_pwr' specified
in initializer
Kevin
Hi Chris,
On Thursday 29 August 2013 07:42:26 Kevin Hilman wrote:
> On Wed, Aug 28, 2013 at 12:51 AM, Laurent Pinchart wrote:
> > On Wednesday 28 August 2013 08:41:26 Lee Jones wrote:
> >> > > Since 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> >> > > platform data", .set_pwr() callback is removed from platform data.
> >> > > Thus, .set_pwr() is not used anymore. Also, this patch fixes
> >> > > the following build error and warning.
> >> > >
> >> > > drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified
> >> > > in initializer drivers/mfd/asic3.c:724:2: warning: initialization
> >> > > makes integer from pointer without a cast [enabled by default]
> >> > > drivers/mfd/asic3.c:724:2: warning: (near initialization for
> >> > > 'asic3_mmc_data.capabilities' [enabled by default]
> >> >
> >> > My bad, it looks like I've overlooked a few users of the .set_pwr()
> >> > field
> >> >
> >> > :-/ Sorry about that.
> >>
> >> <snip>
> >>
> >> > I don't think blindly removing the function is the right fix, as it
> >> > seems to be needed. Looking at the whole series, I believe we should
> >> > just revert 3af9d15 "mmc: tmio-mmc: Remove .set_pwr() callback from
> >> > platform data" instead.
> >>
> >> No need to revert it, as it's not in Mainline yet. Just request for it
> >> to be removed from Chris' tree.
> >
> > I spupose it depends on whether Chris has provided a stable branch with
> > the patch included. I'm fine with both, the commit just needs to be undone
> > one way or another.
>
> Any progress on this? linux-next builds are still failing for the
> following defconfigs because of this removal:
Chris, could you please drop 3af9d15 "mmc: tmio-mmc: Remove .set_pwr()
callback from platform data" from your tree or revert it ?
> Failed defconfigs:
> arm-magician_defconfig
> arm-eseries_pxa_defconfig
>
> Errors:
>
> arm-magician_defconfig
> drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in
> initializer
>
> arm-eseries_pxa_defconfig
> drivers/mfd/t7l66xb.c:146:2: error: unknown field 'set_pwr' specified
> in initializer
> drivers/mfd/tc6387xb.c:123:2: error: unknown field 'set_pwr' specified
> in initializer
> drivers/mfd/tc6393xb.c:381:2: error: unknown field 'set_pwr' specified
> in initializer
--
Regards,
Laurent Pinchart
Hi,
On Thu, Aug 29 2013, Laurent Pinchart wrote:
>> Any progress on this? linux-next builds are still failing for the
>> following defconfigs because of this removal:
>
> Chris, could you please drop 3af9d15 "mmc: tmio-mmc: Remove .set_pwr()
> callback from platform data" from your tree or revert it ?
Sorry for the delay. I decided to revert instead of rebase, so I've
pushed a revert to mmc-next now. (I haven't sent mmc-next to mainline
yet.)
Thanks,
- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>