| Message ID | E1cOqRP-00026r-Q6@debutante (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Jan 4, 2017 at 8:37 PM, Mark Brown <broonie@kernel.org> wrote: > The patch > > spi: dw: Make debugfs name unique between instances > > has been applied to the spi tree at > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git > > All being well this means that it will be integrated into the linux-next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted. > > You may get further e-mails resulting from automated or manual testing > and review of the tree, please engage with people reporting problems and > send followup patches addressing any issues that are reported if needed. > > If any updates are required or you are submitting further changes they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when replying > to this mail. Hmm... We are still discussing the approach. > > Thanks, > Mark > > From 13288bdf4adbaa6bd1267f10044c1bc25d90ce7f Mon Sep 17 00:00:00 2001 > From: Phil Reid <preid@electromag.com.au> > Date: Thu, 22 Dec 2016 17:18:12 +0800 > Subject: [PATCH] spi: dw: Make debugfs name unique between instances > > Some system have multiple dw devices. Currently the driver uses a > fixed name for the debugfs dir. Append dev name to the debugfs dir > name to make it unique. > > Signed-off-by: Phil Reid <preid@electromag.com.au> > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > drivers/spi/spi-dw.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c > index b715a26a9148..054012f87567 100644 > --- a/drivers/spi/spi-dw.c > +++ b/drivers/spi/spi-dw.c > @@ -107,7 +107,10 @@ static const struct file_operations dw_spi_regs_ops = { > > static int dw_spi_debugfs_init(struct dw_spi *dws) > { > - dws->debugfs = debugfs_create_dir("dw_spi", NULL); > + char name[128]; > + > + snprintf(name, 128, "dw_spi-%s", dev_name(&dws->master->dev)); > + dws->debugfs = debugfs_create_dir(name, NULL); > if (!dws->debugfs) > return -ENOMEM; > > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-spi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jan 05, 2017 at 12:45:48AM +0200, Andy Shevchenko wrote: > On Wed, Jan 4, 2017 at 8:37 PM, Mark Brown <broonie@kernel.org> wrote: > > Please add any relevant lists and maintainers to the CCs when replying > > to this mail. > Hmm... We are still discussing the approach. I applied this before you started discussing the approach...
G'day Mark, On 5/01/2017 09:01, Mark Brown wrote: > On Thu, Jan 05, 2017 at 12:45:48AM +0200, Andy Shevchenko wrote: >> On Wed, Jan 4, 2017 at 8:37 PM, Mark Brown <broonie@kernel.org> wrote: > >>> Please add any relevant lists and maintainers to the CCs when replying >>> to this mail. > >> Hmm... We are still discussing the approach. > > I applied this before you started discussing the approach... > There was a v2 of the patch sent Tue 12:54 +0800 Which uses the bus number. There's also a problem with the name registering the name of the irq. Please let me know how to proceed. Should I apply new patches against v1 of this patch now?
On Thu, Jan 05, 2017 at 10:29:02AM +0800, Phil Reid wrote: > On 5/01/2017 09:01, Mark Brown wrote: > > I applied this before you started discussing the approach... > There was a v2 of the patch sent Tue 12:54 +0800 > Which uses the bus number. > There's also a problem with the name registering the name of the irq. This was also after I applied the patch. > Please let me know how to proceed. > Should I apply new patches against v1 of this patch now? Yes, please.
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index b715a26a9148..054012f87567 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -107,7 +107,10 @@ static const struct file_operations dw_spi_regs_ops = { static int dw_spi_debugfs_init(struct dw_spi *dws) { - dws->debugfs = debugfs_create_dir("dw_spi", NULL); + char name[128]; + + snprintf(name, 128, "dw_spi-%s", dev_name(&dws->master->dev)); + dws->debugfs = debugfs_create_dir(name, NULL); if (!dws->debugfs) return -ENOMEM;