Re: [PATCH v4] mmc: Make ID freq configurable

[Andrew Morton <akpm@linux-foundation.org>]

On Fri, 3 Sep 2010 02:47:57 +0100
Chris Ball <cjb@laptop.org> wrote:

> > -	mmc_send_if_cond(host, host->ocr_avail);
> > +		printk ("mmc_rescan: trying %u Hz\n", host->f_init);
> 
> Need a loglevel here, and an mmc_hostname.  Something like:
> 
>                 pr_info("%s: %s: trying to init card at %u Hz\n",
>                         mmc_hostname(host), __func__, host->f_init);
> 
> > +		mmc_power_up(host);
> > +		sdio_reset(host);
> > +		mmc_go_idle(host);
> > 
> > -	/*
> > -	 * First we search for SDIO...
> > -	 */
> > -	err = mmc_send_io_op_cond(host, 0, &ocr);
> > -	if (!err) {
> > -		if (mmc_attach_sdio(host, ocr)) {
> > -			mmc_claim_host(host);
> > -			/* try SDMEM (but not MMC) even if SDIO is broken */
> > -			if (mmc_send_app_op_cond(host, 0, &ocr))
> > -				goto out_fail;
> > +		mmc_send_if_cond(host, host->ocr_avail);
> > +
> > +		/*
> > +		 * First we search for SDIO...
> > +		 */
> > +		err = mmc_send_io_op_cond(host, 0, &ocr);
> > +		if (!err) {
> > +			if (mmc_attach_sdio(host, ocr)) {
> > +				mmc_claim_host(host);
> > +				/* try SDMEM (but not MMC) even if SDIO is broken */
> 
> This breaks 80-chars, so:
> 
>                                 /*
>                                  * Try SDMEM (but not MMC) even if SDIO
>                                  * is broken.
>                                  */

yup.

--- a/drivers/mmc/core/core.c~mmc-make-id-freq-configurable-checkpatch-fixes
+++ a/drivers/mmc/core/core.c
@@ -1450,7 +1450,9 @@ void mmc_rescan(struct work_struct *work
 		else
 			host->f_init = host->f_min;
 
-		printk ("mmc_rescan: trying %u Hz\n", host->f_init);
+		pr_info("%s: %s: trying to init card at %u Hz\n",
+			mmc_hostname(host), __func__, host->f_init);
+
 		mmc_power_up(host);
 		sdio_reset(host);
 		mmc_go_idle(host);
@@ -1464,7 +1466,10 @@ void mmc_rescan(struct work_struct *work
 		if (!err) {
 			if (mmc_attach_sdio(host, ocr)) {
 				mmc_claim_host(host);
-				/* try SDMEM (but not MMC) even if SDIO is broken */
+				/*
+				 * Try SDMEM (but not MMC) even if SDIO is
+				 * broken.
+				 */
 				if (mmc_send_app_op_cond(host, 0, &ocr))
 					goto out_fail;
 
diff -puN include/linux/mmc/host.h~mmc-make-id-freq-configurable-checkpatch-fixes include/linux/mmc/host.h
_