mfd: asic3: Remove .set_pwr() callback
PATCH 1/5 mfd: asic3: Remove .set_pwr() callback
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]
--- drivers/mfd/asic3.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/mfd/asic3.c +0 -8
@@ -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, };
Signature · 1 line
1.7.10.4
PATCH 2/5 mfd: t7l66xb: Remove .set_pwr() callback
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]
--- drivers/mfd/t7l66xb.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/mfd/t7l66xb.c +0 -9
@@ -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, };
Signature · 1 line
1.7.10.4
PATCH 3/5 mfd: tc6387xb: Remove .set_pwr() callback
In reply to Jingoo HanSince 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]
--- drivers/mfd/tc6387xb.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/mfd/tc6387xb.c +0 -9
@@ -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, };
Signature · 1 line
1.7.10.4
PATCH 4/5 mfd: tc6393xb: Remove .set_pwr() callback
In reply to Jingoo HanSince 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]
--- drivers/mfd/tc6393xb.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/mfd/tc6393xb.c +0 -9
@@ -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, };
Signature · 1 line
1.7.10.4
PATCH 5/5 mfd: tmio_core: Remove tmio_core_mmc_pwr()
In reply to Jingoo Hantmio_core_mmc_pwr() is not called anymore, so remove it.
--- drivers/mfd/tmio_core.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/mfd/tmio_core.c +0 -6
@@ -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 );
Signature · 1 line
1.7.10.4
Quoted 5 lines · Jingoo Han
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
Quoted 44 lines
drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializerdrivers/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(-)drivers/mfd/asic3.c +0
-9@@ -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
Quoted 5 lines
Quoted 4 lines
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.
Quoted 7 lines
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?
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Hi Jingoo,
Thank you for the patch.
Quoted 10 lines · 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 initializerdrivers/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.
Quoted 14 lines
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(-)drivers/mfd/asic3.c +0
-0
drivers/mfd/asic3.c static struct mfd_cell asic3_cell_ds1wm = { · line 714
Quoted 10 lines
drivers/mfd/asic3.c +0
-7@@ -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.
Quoted 11 lines
drivers/mfd/asic3.c +0
-1static 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, };
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 13 lines
Quoted 10 lines
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 initializerdrivers/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>
Quoted 4 lines
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.
Signature · 4 lines
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)
Quoted 16 lines · On Wednesday 28 August 2013 08:41:26 Lee Jones wrote:
Quoted 13 lines
Quoted 10 lines
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 initializerdrivers/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>
Quoted 7 lines
Quoted 4 lines
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.
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 27 lines · Laurent Pinchart
Hi Lee,
(Dropping Ian Molton <[email protected]> from the CC list as the e- mail address isn't valid anymore)
Quoted 21 lines · On Wednesday 28 August 2013 08:41:26 Lee Jones wrote:
Quoted 13 lines
Quoted 10 lines
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 initializerdrivers/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>
Quoted 4 lines
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.
Quoted 6 lines
Quoted 2 lines
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_defconfigdrivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializer
arm-eseries_pxa_defconfigdrivers/mfd/t7l66xb.c:146:2: error: unknown field 'set_pwr' specified in initializerdrivers/mfd/tc6387xb.c:123:2: error: unknown field 'set_pwr' specified in initializerdrivers/mfd/tc6393xb.c:381:2: error: unknown field 'set_pwr' specified in initializer
Kevin
Hi Chris,
Quoted 28 lines · On Thursday 29 August 2013 07:42:26 Kevin Hilman wrote:
Quoted 27 lines · Laurent Pinchart
Quoted 25 lines · On Wednesday 28 August 2013 08:41:26 Lee Jones wrote:
Quoted 15 lines
Quoted 10 lines
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 initializerdrivers/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>
Quoted 4 lines
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.
Quoted 6 lines
Quoted 3 lines
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 ?
Quoted 17 lines
Failed defconfigs:
arm-magician_defconfig
arm-eseries_pxa_defconfigErrors:
arm-magician_defconfig
drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializerarm-eseries_pxa_defconfig
drivers/mfd/t7l66xb.c:146:2: error: unknown field 'set_pwr' specified in initializerdrivers/mfd/tc6387xb.c:123:2: error: unknown field 'set_pwr' specified in initializerdrivers/mfd/tc6393xb.c:381:2: error: unknown field 'set_pwr' specified in initializer
Signature · 3 lines
Regards, Laurent Pinchart
Hi,
Quoted 5 lines · Laurent Pinchart
Quoted 2 lines
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.
Signature · 1 line
Chris Ball <[email protected]> <http://printf.net/>