[MXS MMC 0/5] Some cleanups and fixes for the MXS MMC subsystem

[MXS MMC 0/5] Some cleanups and fixes for the MXS MMC subsystem

[Lothar Waßmann]

Lothar Wa??mann (5):
  Fix grammatical error in comment
  Some cleanups for the MMC driver
  Add support for SSP/MMC ports 2 & 3
  Check the return codes of clk_enable() and mxs_reset_block()
  Add an appropriate MODULE_ALIAS

 arch/arm/mach-mxs/clock-mx28.c               |    6 ++-
 arch/arm/mach-mxs/devices/platform-mxs-mmc.c |    2 +
 drivers/mmc/host/mxs-mmc.c                   |   84 +++++++++++++++----------
 3 files changed, 57 insertions(+), 35 deletions(-)

[MXS MMC 4/5] Check the return codes of clk_enable() and mxs_reset_block()

[Wolfram Sang]

On Tue, Dec 06, 2011 at 02:41:29PM +0100, Lothar Wa?mann wrote:
> Add an int return value to mxs_mmc_reset(), so that the return code of
> mxs_reset_block() can be promoted to the caller.
> Also check the return code of clk_enable() in the probe function.
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> -	clk_enable(host->clk);
> +	ret = clk_enable(host->clk);
> +	if (ret) {
> +		dev_err(mmc_dev(host->mmc),
> +			"%s: failed to enable clock: %d\n", __func__, ret);
> +		goto out_clk_put;
> +	}
>  
> -	mxs_mmc_reset(host);
> +	ret = mxs_mmc_reset(host);
> +	if (ret) {
> +		dev_err(mmc_dev(host->mmc),
> +			"%s: failed to reset controller: %d\n", __func__, ret);
> +		goto out_clk_put;
> +	}

Why __func__ here? dev_err and the msg itself should be indication enough?

Otherwise

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111206/f88dc302/attachment.sig>

[MXS MMC 4/5] Check the return codes of clk_enable() and mxs_reset_block()

[Shawn Guo]

On Tue, Dec 06, 2011 at 02:41:29PM +0100, Lothar Wa?mann wrote:
> Add an int return value to mxs_mmc_reset(), so that the return code of
> mxs_reset_block() can be promoted to the caller.
> Also check the return code of clk_enable() in the probe function.
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

-- 
Regards,
Shawn

[MXS MMC 5/5] Add an appropriate MODULE_ALIAS

[Wolfram Sang]

On Tue, Dec 06, 2011 at 02:41:30PM +0100, Lothar Wa?mann wrote:
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111206/fddccdcf/attachment.sig>

[MXS MMC 5/5] Add an appropriate MODULE_ALIAS

[Shawn Guo]

On Tue, Dec 06, 2011 at 02:41:30PM +0100, Lothar Wa?mann wrote:
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> ---
>  drivers/mmc/host/mxs-mmc.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 0003d03..1ba08ae 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -886,3 +886,4 @@ module_exit(mxs_mmc_exit);
>  MODULE_DESCRIPTION("FREESCALE MXS MMC peripheral");
>  MODULE_AUTHOR("Freescale Semiconductor");
>  MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:mxs-mmc");

Acked-by: Shawn Guo <shawn.guo@linaro.org>

-- 
Regards,
Shawn

[MXS MMC 1/5] Fix grammatical error in comment

[Wolfram Sang]

On Tue, Dec 06, 2011 at 02:41:26PM +0100, Lothar Wa?mann wrote:
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111206/8eeada94/attachment-0001.sig>

[MXS MMC 1/5] Fix grammatical error in comment

[Shawn Guo]

On Tue, Dec 06, 2011 at 02:41:26PM +0100, Lothar Wa?mann wrote:
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> ---
>  arch/arm/mach-mxs/clock-mx28.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
> index da6e4aa..fc86b04 100644
> --- a/arch/arm/mach-mxs/clock-mx28.c
> +++ b/arch/arm/mach-mxs/clock-mx28.c
> @@ -554,7 +554,7 @@ static struct clk rtc_clk = {
>  	.parent = &ref_xtal_clk,
>  };
>  
> -/* usb_clk gate is controlled in DIGCTRL other than CLKCTRL */
> +/* usb_clk gate is controlled in DIGCTRL rather than CLKCTRL */
>  static struct clk usb0_clk = {
>  	.enable_reg = DIGCTRL_BASE_ADDR,
>  	.enable_shift = 2,
> -- 

Acked-by: Shawn Guo <shawn.guo@linaro.org>

-- 
Regards,
Shawn

[MXS MMC 2/5] Some cleanups for the MMC driver

[Shawn Guo]

I'm fine with this cosmetic patch with the comments below addressed.

On Tue, Dec 06, 2011 at 02:41:27PM +0100, Lothar Wa?mann wrote:
>  - Remove bogus parens around numerical arguments in #define's
>  - When defining bit masks, use the #def for the shift count
>    instead of repeating the numbers

This change brings a few 'line over 80 characters' checkpatch warnings.

>  - Remove bogus whitespace in indentation
>  - Remove 'break' at end of switch statement
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> ---
>  drivers/mmc/host/mxs-mmc.c |   57 +++++++++++++++++++++----------------------
>  1 files changed, 28 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
[...]
> @@ -277,7 +277,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
>  
>  	stat = readl(host->base + HW_SSP_CTRL1);
>  	writel(stat & MXS_MMC_IRQ_BITS,
> -	       host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);

This is an intended indentation with 7 spaces.

Regards,
Shawn

> +		host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);

[MXS MMC 2/5] Some cleanups for the MMC driver

[Lothar Waßmann]

Hi,

Shawn Guo writes:
> I'm fine with this cosmetic patch with the comments below addressed.
> 
> On Tue, Dec 06, 2011 at 02:41:27PM +0100, Lothar Wa?mann wrote:
> >  - Remove bogus parens around numerical arguments in #define's
> >  - When defining bit masks, use the #def for the shift count
> >    instead of repeating the numbers
> 
> This change brings a few 'line over 80 characters' checkpatch warnings.
> 
will fix.

> >  - Remove bogus whitespace in indentation
> >  - Remove 'break' at end of switch statement
> > 
> > Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> > ---
> >  drivers/mmc/host/mxs-mmc.c |   57 +++++++++++++++++++++----------------------
> >  1 files changed, 28 insertions(+), 29 deletions(-)
> > 
> > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> [...]
> > @@ -277,7 +277,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
> >  
> >  	stat = readl(host->base + HW_SSP_CTRL1);
> >  	writel(stat & MXS_MMC_IRQ_BITS,
> > -	       host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);
> 
> This is an intended indentation with 7 spaces.
> 
According to Documentation/CodingStyle spaces are never used for
indentation (except in documentation, Kconfig and comments).


Lothar Wa?mann
-- 
___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________

[MXS MMC 2/5] Some cleanups for the MMC driver

[Shawn Guo]

On Wed, Dec 07, 2011 at 12:57:44PM +0100, Lothar Wa?mann wrote:
> Hi,
> 
> Shawn Guo writes:
> > I'm fine with this cosmetic patch with the comments below addressed.
> > 
> > On Tue, Dec 06, 2011 at 02:41:27PM +0100, Lothar Wa?mann wrote:
> > >  - Remove bogus parens around numerical arguments in #define's
> > >  - When defining bit masks, use the #def for the shift count
> > >    instead of repeating the numbers
> > 
> > This change brings a few 'line over 80 characters' checkpatch warnings.
> > 
> will fix.
> 
> > >  - Remove bogus whitespace in indentation
> > >  - Remove 'break' at end of switch statement
> > > 
> > > Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> > > ---
> > >  drivers/mmc/host/mxs-mmc.c |   57 +++++++++++++++++++++----------------------
> > >  1 files changed, 28 insertions(+), 29 deletions(-)
> > > 
> > > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> > [...]
> > > @@ -277,7 +277,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
> > >  
> > >  	stat = readl(host->base + HW_SSP_CTRL1);
> > >  	writel(stat & MXS_MMC_IRQ_BITS,
> > > -	       host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);
> > 
> > This is an intended indentation with 7 spaces.
> > 
> According to Documentation/CodingStyle spaces are never used for
> indentation (except in documentation, Kconfig and comments).
> 
Such nice indentation is all over this driver and even kernel tree.
You may want to leave it as it is or fix them all over the driver.

-- 
Regards,
Shawn

[MXS MMC 2/5] Some cleanups for the MMC driver

[Uwe Kleine-König]

On Wed, Dec 07, 2011 at 12:57:44PM +0100, Lothar Wa?mann wrote:
> Hi,
> 
> Shawn Guo writes:
> > I'm fine with this cosmetic patch with the comments below addressed.
> > 
> > On Tue, Dec 06, 2011 at 02:41:27PM +0100, Lothar Wa?mann wrote:
> > >  - Remove bogus parens around numerical arguments in #define's
> > >  - When defining bit masks, use the #def for the shift count
> > >    instead of repeating the numbers
> > 
> > This change brings a few 'line over 80 characters' checkpatch warnings.
> > 
> will fix.
> 
> > >  - Remove bogus whitespace in indentation
> > >  - Remove 'break' at end of switch statement
> > > 
> > > Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
> > > ---
> > >  drivers/mmc/host/mxs-mmc.c |   57 +++++++++++++++++++++----------------------
> > >  1 files changed, 28 insertions(+), 29 deletions(-)
> > > 
> > > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> > [...]
> > > @@ -277,7 +277,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
> > >  
> > >  	stat = readl(host->base + HW_SSP_CTRL1);
> > >  	writel(stat & MXS_MMC_IRQ_BITS,
> > > -	       host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);
> > 
> > This is an intended indentation with 7 spaces.
> > 
> According to Documentation/CodingStyle spaces are never used for
> indentation (except in documentation, Kconfig and comments).
AFAIK "don't use spaces" only applies to the first line of a statement.
When breaking long lines using spaces to align to the containing
parenthesis is quite common (though I don't like it personally).

The rule for follow-up lines is only: Descendants are always
substantially shorter than the parent and are placed substantially to
the right.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[MXS MMC 3/5] Add support for SSP/MMC ports 2 & 3

[Wolfram Sang]

On Tue, Dec 06, 2011 at 02:41:28PM +0100, Lothar Wa?mann wrote:
> i.MX28 has four SSP/MMC units, only two of which are currently
> usable.
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>

Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111206/0b8fba37/attachment.sig>

[MXS MMC 3/5] Add support for SSP/MMC ports 2 & 3

[Shawn Guo]

On Tue, Dec 06, 2011 at 02:41:28PM +0100, Lothar Wa?mann wrote:
> i.MX28 has four SSP/MMC units, only two of which are currently
> usable.
> 
> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>

Applied, thanks.

Please add prefix 'ARM: mxs:' or 'arm/mxs' to make the patch look like
the below in the future submission.

 [PATCH 3/5] ARM: mxs: Add support for SSP/MMC ports 2 & 3

I fixed it this time.

-- 
Regards,
Shawn