* [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages
@ 2021-05-28 11:21 Andy Shevchenko
2021-05-28 11:21 ` [PATCH v1 2/2] mmc: mmc_spi: Imply container_of() to be no-op Andy Shevchenko
2021-05-31 10:16 ` [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages Ulf Hansson
0 siblings, 2 replies; 4+ messages in thread
From: Andy Shevchenko @ 2021-05-28 11:21 UTC (permalink / raw)
To: Andy Shevchenko, Ulf Hansson, linux-mmc, linux-kernel
dev_dbg() in any case prints the device and driver name, no need
to repeat this in (some) messages. Drop duplicates for good.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/mmc/host/mmc_spi.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 9776a03a10f5..65c65bb5737f 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -504,7 +504,7 @@ mmc_spi_command_send(struct mmc_spi_host *host,
/* else: R1 (most commands) */
}
- dev_dbg(&host->spi->dev, " mmc_spi: CMD%d, resp %s\n",
+ dev_dbg(&host->spi->dev, " CMD%d, resp %s\n",
cmd->opcode, maptype(cmd));
/* send command, leaving chipselect active */
@@ -928,8 +928,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,
while (length) {
t->len = min(length, blk_size);
- dev_dbg(&host->spi->dev,
- " mmc_spi: %s block, %d bytes\n",
+ dev_dbg(&host->spi->dev, " %s block, %d bytes\n",
(direction == DMA_TO_DEVICE) ? "write" : "read",
t->len);
@@ -974,7 +973,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,
int tmp;
const unsigned statlen = sizeof(scratch->status);
- dev_dbg(&spi->dev, " mmc_spi: STOP_TRAN\n");
+ dev_dbg(&spi->dev, " STOP_TRAN\n");
/* Tweak the per-block message we set up earlier by morphing
* it to hold single buffer with the token followed by some
@@ -1175,7 +1174,7 @@ static void mmc_spi_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
canpower = host->pdata && host->pdata->setpower;
- dev_dbg(&host->spi->dev, "mmc_spi: power %s (%d)%s\n",
+ dev_dbg(&host->spi->dev, "power %s (%d)%s\n",
mmc_powerstring(ios->power_mode),
ios->vdd,
canpower ? ", can switch" : "");
@@ -1248,8 +1247,7 @@ static void mmc_spi_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
host->spi->max_speed_hz = ios->clock;
status = spi_setup(host->spi);
- dev_dbg(&host->spi->dev,
- "mmc_spi: clock to %d Hz, %d\n",
+ dev_dbg(&host->spi->dev, " clock to %d Hz, %d\n",
host->spi->max_speed_hz, status);
}
}
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v1 2/2] mmc: mmc_spi: Imply container_of() to be no-op
2021-05-28 11:21 [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages Andy Shevchenko
@ 2021-05-28 11:21 ` Andy Shevchenko
2021-05-31 10:16 ` Ulf Hansson
2021-05-31 10:16 ` [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages Ulf Hansson
1 sibling, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2021-05-28 11:21 UTC (permalink / raw)
To: Andy Shevchenko, Ulf Hansson, linux-mmc, linux-kernel
Since we don't use structure field layout randomization
the manual shuffling can affect some macros, in particular
container_of() against struct of_mmc_spi, which becomes
a no-op when pdata member is the first one in the structure.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/mmc/host/of_mmc_spi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index 9d480a05f655..3629550528b6 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -22,8 +22,8 @@
MODULE_LICENSE("GPL");
struct of_mmc_spi {
- int detect_irq;
struct mmc_spi_platform_data pdata;
+ int detect_irq;
};
static struct of_mmc_spi *to_of_mmc_spi(struct device *dev)
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages
2021-05-28 11:21 [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages Andy Shevchenko
2021-05-28 11:21 ` [PATCH v1 2/2] mmc: mmc_spi: Imply container_of() to be no-op Andy Shevchenko
@ 2021-05-31 10:16 ` Ulf Hansson
1 sibling, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2021-05-31 10:16 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-mmc, Linux Kernel Mailing List
On Fri, 28 May 2021 at 13:21, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> dev_dbg() in any case prints the device and driver name, no need
> to repeat this in (some) messages. Drop duplicates for good.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/mmc_spi.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
> index 9776a03a10f5..65c65bb5737f 100644
> --- a/drivers/mmc/host/mmc_spi.c
> +++ b/drivers/mmc/host/mmc_spi.c
> @@ -504,7 +504,7 @@ mmc_spi_command_send(struct mmc_spi_host *host,
> /* else: R1 (most commands) */
> }
>
> - dev_dbg(&host->spi->dev, " mmc_spi: CMD%d, resp %s\n",
> + dev_dbg(&host->spi->dev, " CMD%d, resp %s\n",
> cmd->opcode, maptype(cmd));
>
> /* send command, leaving chipselect active */
> @@ -928,8 +928,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,
> while (length) {
> t->len = min(length, blk_size);
>
> - dev_dbg(&host->spi->dev,
> - " mmc_spi: %s block, %d bytes\n",
> + dev_dbg(&host->spi->dev, " %s block, %d bytes\n",
> (direction == DMA_TO_DEVICE) ? "write" : "read",
> t->len);
>
> @@ -974,7 +973,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,
> int tmp;
> const unsigned statlen = sizeof(scratch->status);
>
> - dev_dbg(&spi->dev, " mmc_spi: STOP_TRAN\n");
> + dev_dbg(&spi->dev, " STOP_TRAN\n");
>
> /* Tweak the per-block message we set up earlier by morphing
> * it to hold single buffer with the token followed by some
> @@ -1175,7 +1174,7 @@ static void mmc_spi_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>
> canpower = host->pdata && host->pdata->setpower;
>
> - dev_dbg(&host->spi->dev, "mmc_spi: power %s (%d)%s\n",
> + dev_dbg(&host->spi->dev, "power %s (%d)%s\n",
> mmc_powerstring(ios->power_mode),
> ios->vdd,
> canpower ? ", can switch" : "");
> @@ -1248,8 +1247,7 @@ static void mmc_spi_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>
> host->spi->max_speed_hz = ios->clock;
> status = spi_setup(host->spi);
> - dev_dbg(&host->spi->dev,
> - "mmc_spi: clock to %d Hz, %d\n",
> + dev_dbg(&host->spi->dev, " clock to %d Hz, %d\n",
> host->spi->max_speed_hz, status);
> }
> }
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 2/2] mmc: mmc_spi: Imply container_of() to be no-op
2021-05-28 11:21 ` [PATCH v1 2/2] mmc: mmc_spi: Imply container_of() to be no-op Andy Shevchenko
@ 2021-05-31 10:16 ` Ulf Hansson
0 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2021-05-31 10:16 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-mmc, Linux Kernel Mailing List
On Fri, 28 May 2021 at 13:21, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> Since we don't use structure field layout randomization
> the manual shuffling can affect some macros, in particular
> container_of() against struct of_mmc_spi, which becomes
> a no-op when pdata member is the first one in the structure.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/of_mmc_spi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
> index 9d480a05f655..3629550528b6 100644
> --- a/drivers/mmc/host/of_mmc_spi.c
> +++ b/drivers/mmc/host/of_mmc_spi.c
> @@ -22,8 +22,8 @@
> MODULE_LICENSE("GPL");
>
> struct of_mmc_spi {
> - int detect_irq;
> struct mmc_spi_platform_data pdata;
> + int detect_irq;
> };
>
> static struct of_mmc_spi *to_of_mmc_spi(struct device *dev)
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-31 10:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-28 11:21 [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages Andy Shevchenko
2021-05-28 11:21 ` [PATCH v1 2/2] mmc: mmc_spi: Imply container_of() to be no-op Andy Shevchenko
2021-05-31 10:16 ` Ulf Hansson
2021-05-31 10:16 ` [PATCH v1 1/2] mmc: mmc_spi: Drop duplicate 'mmc_spi' in the debug messages Ulf Hansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.