| Message ID | 1402679637-27611-3-git-send-email-markus.mayer@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 13 June 2014 19:13, Markus Mayer <markus.mayer@linaro.org> wrote: > After the switch to the MMC core regulator infrastucture, we already > have a local "mmc" pointer in various functions. There is no longer a > need to access the data structure via host->mmc. > > Signed-off-by: Markus Mayer <markus.mayer@linaro.org> > Reviewed-by: Matt Porter <mporter@linaro.org> Hi Markus, Could you run checkpatch? There were some warnings to handle. Kind regards Ulf Hansson > --- > drivers/mmc/host/sdhci.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index ee524b0..54b5304 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -1287,7 +1287,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode, > > if (!IS_ERR(mmc->supply.vmmc)) { > spin_unlock_irq(&host->lock); > - mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, vdd); > + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); > spin_lock_irq(&host->lock); > } > } > @@ -1449,7 +1449,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) > spin_unlock_irqrestore(&host->lock, flags); > if (!IS_ERR(mmc->supply.vmmc) && > ios->power_mode == MMC_POWER_OFF) > - mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, 0); > + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); > return; > } > > @@ -1734,7 +1734,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, > 3600000); > if (ret) { > pr_warning("%s: Switching to 3.3V signalling voltage " > - " failed\n", mmc_hostname(host->mmc)); > + " failed\n", mmc_hostname(mmc)); > return -EIO; > } > } > @@ -1747,7 +1747,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, > return 0; > > pr_warning("%s: 3.3V regulator output did not became stable\n", > - mmc_hostname(host->mmc)); > + mmc_hostname(mmc)); > > return -EAGAIN; > case MMC_SIGNAL_VOLTAGE_180: > @@ -1756,7 +1756,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, > 1700000, 1950000); > if (ret) { > pr_warning("%s: Switching to 1.8V signalling voltage " > - " failed\n", mmc_hostname(host->mmc)); > + " failed\n", mmc_hostname(mmc)); > return -EIO; > } > } > @@ -1777,7 +1777,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, > return 0; > > pr_warning("%s: 1.8V regulator output did not became stable\n", > - mmc_hostname(host->mmc)); > + mmc_hostname(mmc)); > > return -EAGAIN; > case MMC_SIGNAL_VOLTAGE_120: > @@ -1786,7 +1786,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, > 1300000); > if (ret) { > pr_warning("%s: Switching to 1.2V signalling voltage " > - " failed\n", mmc_hostname(host->mmc)); > + " failed\n", mmc_hostname(mmc)); > return -EIO; > } > } > @@ -2826,12 +2826,12 @@ int sdhci_add_host(struct sdhci_host *host) > * (128) and potentially one alignment transfer for > * each of those entries. > */ > - host->adma_desc = dma_alloc_coherent(mmc_dev(host->mmc), > + host->adma_desc = dma_alloc_coherent(mmc_dev(mmc), > ADMA_SIZE, &host->adma_addr, > GFP_KERNEL); > host->align_buffer = kmalloc(128 * 4, GFP_KERNEL); > if (!host->adma_desc || !host->align_buffer) { > - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, > + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, > host->adma_desc, host->adma_addr); > kfree(host->align_buffer); > pr_warning("%s: Unable to allocate ADMA " > @@ -2844,7 +2844,7 @@ int sdhci_add_host(struct sdhci_host *host) > pr_warning("%s: unable to allocate aligned ADMA descriptor\n", > mmc_hostname(mmc)); > host->flags &= ~SDHCI_USE_ADMA; > - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, > + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, > host->adma_desc, host->adma_addr); > kfree(host->align_buffer); > host->adma_desc = NULL; > @@ -2859,7 +2859,7 @@ int sdhci_add_host(struct sdhci_host *host) > */ > if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))) { > host->dma_mask = DMA_BIT_MASK(64); > - mmc_dev(host->mmc)->dma_mask = &host->dma_mask; > + mmc_dev(mmc)->dma_mask = &host->dma_mask; > } > > if (host->version >= SDHCI_SPEC_300) > @@ -2965,7 +2965,7 @@ int sdhci_add_host(struct sdhci_host *host) > mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; > > if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && > - !(host->mmc->caps & MMC_CAP_NONREMOVABLE)) > + !(mmc->caps & MMC_CAP_NONREMOVABLE)) > mmc->caps |= MMC_CAP_NEEDS_POLL; > > /* If there are external regulators, get them */ > @@ -3261,7 +3261,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) > > if (host->mrq) { > pr_err("%s: Controller removed during " > - " transfer!\n", mmc_hostname(host->mmc)); > + " transfer!\n", mmc_hostname(mmc)); > > host->mrq->cmd->error = -ENOMEDIUM; > tasklet_schedule(&host->finish_tasklet); > @@ -3272,7 +3272,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) > > sdhci_disable_card_detection(host); > > - mmc_remove_host(host->mmc); > + mmc_remove_host(mmc); > > #ifdef SDHCI_USE_LEDS_CLASS > led_classdev_unregister(&host->led); > @@ -3296,7 +3296,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) > regulator_disable(mmc->supply.vqmmc); > > if (host->adma_desc) > - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, > + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, > host->adma_desc, host->adma_addr); > kfree(host->align_buffer); > > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 16 June 2014 01:23, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 13 June 2014 19:13, Markus Mayer <markus.mayer@linaro.org> wrote: >> After the switch to the MMC core regulator infrastucture, we already >> have a local "mmc" pointer in various functions. There is no longer a >> need to access the data structure via host->mmc. >> >> Signed-off-by: Markus Mayer <markus.mayer@linaro.org> >> Reviewed-by: Matt Porter <mporter@linaro.org> > > Could you run checkpatch? There were some warnings to handle. You're right. There are several warnings regarding wrapped strings. However, those warnings are unrelated to my changes. The wrapped strings exist in current code. See for instance: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/mmc/host/sdhci.c?id=refs/tags/v3.16-rc1#n1730 I don't think I should intermix my "host->mmc to mmc" replacement patch with changes to fix the wrapping of strings. If you would like these string related checkpatch warnings fixed, I can look into creating a follow-on patch to fix those up. There are quite a few more instances in sdhci.c that wouldn't get addressed if I simply fixed up my existing patch. And that would be the other argument against intermixing 2 different fixes: I wouldn't be taking care of all string wrapping issues if I just fixed the four instances it complains about in my patch. Some of those wrapped strings are actually quite long. Here's an example: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/mmc/host/sdhci.c?id=refs/tags/v3.16-rc1#n1938 So, fixing those long messages may take a bit more thought than one might initially expect. Please let me know how you would like to proceed. Thanks, -Markus -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ee524b0..54b5304 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1287,7 +1287,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode, if (!IS_ERR(mmc->supply.vmmc)) { spin_unlock_irq(&host->lock); - mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, vdd); + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); spin_lock_irq(&host->lock); } } @@ -1449,7 +1449,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) spin_unlock_irqrestore(&host->lock, flags); if (!IS_ERR(mmc->supply.vmmc) && ios->power_mode == MMC_POWER_OFF) - mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, 0); + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); return; } @@ -1734,7 +1734,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, 3600000); if (ret) { pr_warning("%s: Switching to 3.3V signalling voltage " - " failed\n", mmc_hostname(host->mmc)); + " failed\n", mmc_hostname(mmc)); return -EIO; } } @@ -1747,7 +1747,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, return 0; pr_warning("%s: 3.3V regulator output did not became stable\n", - mmc_hostname(host->mmc)); + mmc_hostname(mmc)); return -EAGAIN; case MMC_SIGNAL_VOLTAGE_180: @@ -1756,7 +1756,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, 1700000, 1950000); if (ret) { pr_warning("%s: Switching to 1.8V signalling voltage " - " failed\n", mmc_hostname(host->mmc)); + " failed\n", mmc_hostname(mmc)); return -EIO; } } @@ -1777,7 +1777,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, return 0; pr_warning("%s: 1.8V regulator output did not became stable\n", - mmc_hostname(host->mmc)); + mmc_hostname(mmc)); return -EAGAIN; case MMC_SIGNAL_VOLTAGE_120: @@ -1786,7 +1786,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, 1300000); if (ret) { pr_warning("%s: Switching to 1.2V signalling voltage " - " failed\n", mmc_hostname(host->mmc)); + " failed\n", mmc_hostname(mmc)); return -EIO; } } @@ -2826,12 +2826,12 @@ int sdhci_add_host(struct sdhci_host *host) * (128) and potentially one alignment transfer for * each of those entries. */ - host->adma_desc = dma_alloc_coherent(mmc_dev(host->mmc), + host->adma_desc = dma_alloc_coherent(mmc_dev(mmc), ADMA_SIZE, &host->adma_addr, GFP_KERNEL); host->align_buffer = kmalloc(128 * 4, GFP_KERNEL); if (!host->adma_desc || !host->align_buffer) { - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, host->adma_desc, host->adma_addr); kfree(host->align_buffer); pr_warning("%s: Unable to allocate ADMA " @@ -2844,7 +2844,7 @@ int sdhci_add_host(struct sdhci_host *host) pr_warning("%s: unable to allocate aligned ADMA descriptor\n", mmc_hostname(mmc)); host->flags &= ~SDHCI_USE_ADMA; - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, host->adma_desc, host->adma_addr); kfree(host->align_buffer); host->adma_desc = NULL; @@ -2859,7 +2859,7 @@ int sdhci_add_host(struct sdhci_host *host) */ if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))) { host->dma_mask = DMA_BIT_MASK(64); - mmc_dev(host->mmc)->dma_mask = &host->dma_mask; + mmc_dev(mmc)->dma_mask = &host->dma_mask; } if (host->version >= SDHCI_SPEC_300) @@ -2965,7 +2965,7 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && - !(host->mmc->caps & MMC_CAP_NONREMOVABLE)) + !(mmc->caps & MMC_CAP_NONREMOVABLE)) mmc->caps |= MMC_CAP_NEEDS_POLL; /* If there are external regulators, get them */ @@ -3261,7 +3261,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) if (host->mrq) { pr_err("%s: Controller removed during " - " transfer!\n", mmc_hostname(host->mmc)); + " transfer!\n", mmc_hostname(mmc)); host->mrq->cmd->error = -ENOMEDIUM; tasklet_schedule(&host->finish_tasklet); @@ -3272,7 +3272,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) sdhci_disable_card_detection(host); - mmc_remove_host(host->mmc); + mmc_remove_host(mmc); #ifdef SDHCI_USE_LEDS_CLASS led_classdev_unregister(&host->led); @@ -3296,7 +3296,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) regulator_disable(mmc->supply.vqmmc); if (host->adma_desc) - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, host->adma_desc, host->adma_addr); kfree(host->align_buffer);