| Message ID | 20190725234032.21152-4-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soundwire: updates for 5.4 | expand |
On 2019-07-26 01:39, Pierre-Louis Bossart wrote: > SQUASHME > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/soundwire/cadence_master.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c > index 91e8bacb83e3..9f611a1fff0a 100644 > --- a/drivers/soundwire/cadence_master.c > +++ b/drivers/soundwire/cadence_master.c > @@ -234,7 +234,7 @@ static ssize_t cdns_sprintf(struct sdw_cdns *cdns, > char *buf, size_t pos, unsigned int reg) > { > return scnprintf(buf + pos, RD_BUF - pos, > - "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); > + "%4x\t%8x\n", reg, cdns_readl(cdns, reg)); > } > > static ssize_t cdns_reg_read(struct file *file, char __user *user_buf, > Should just be merged together with the introducing commit. Guess it's posted unintentionally.
On 7/26/19 4:38 AM, Cezary Rojewski wrote: > On 2019-07-26 01:39, Pierre-Louis Bossart wrote: >> SQUASHME >> >> Signed-off-by: Pierre-Louis Bossart >> <pierre-louis.bossart@linux.intel.com> >> --- >> drivers/soundwire/cadence_master.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/soundwire/cadence_master.c >> b/drivers/soundwire/cadence_master.c >> index 91e8bacb83e3..9f611a1fff0a 100644 >> --- a/drivers/soundwire/cadence_master.c >> +++ b/drivers/soundwire/cadence_master.c >> @@ -234,7 +234,7 @@ static ssize_t cdns_sprintf(struct sdw_cdns *cdns, >> char *buf, size_t pos, unsigned int reg) >> { >> return scnprintf(buf + pos, RD_BUF - pos, >> - "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); >> + "%4x\t%8x\n", reg, cdns_readl(cdns, reg)); >> } >> static ssize_t cdns_reg_read(struct file *file, char __user *user_buf, >> > > Should just be merged together with the introducing commit. Guess it's > posted unintentionally. Yep, I missed this, will squash in the updates as intended.
On 25-07-19, 18:39, Pierre-Louis Bossart wrote: > SQUASHME Git trick! commit this using: git fixup <sha1> where sha1 is commit where you want this to be squashed into! then below will suuash them for you! git rebase -i --autosquash > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/soundwire/cadence_master.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c > index 91e8bacb83e3..9f611a1fff0a 100644 > --- a/drivers/soundwire/cadence_master.c > +++ b/drivers/soundwire/cadence_master.c > @@ -234,7 +234,7 @@ static ssize_t cdns_sprintf(struct sdw_cdns *cdns, > char *buf, size_t pos, unsigned int reg) > { > return scnprintf(buf + pos, RD_BUF - pos, > - "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); > + "%4x\t%8x\n", reg, cdns_readl(cdns, reg)); > } > > static ssize_t cdns_reg_read(struct file *file, char __user *user_buf, > -- > 2.20.1
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 91e8bacb83e3..9f611a1fff0a 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -234,7 +234,7 @@ static ssize_t cdns_sprintf(struct sdw_cdns *cdns, char *buf, size_t pos, unsigned int reg) { return scnprintf(buf + pos, RD_BUF - pos, - "%4x\t%4x\n", reg, cdns_readl(cdns, reg)); + "%4x\t%8x\n", reg, cdns_readl(cdns, reg)); } static ssize_t cdns_reg_read(struct file *file, char __user *user_buf,
SQUASHME Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)