| Message ID | 20200114233124.13888-1-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soundwire: cadence: fix kernel-doc parameter descriptions | expand |
On 14-01-20, 17:31, Pierre-Louis Bossart wrote:
> Fix previous update, bad git merge likely. oops.
Applied, thanks
On 16-01-20, 17:35, Vinod Koul wrote: > On 14-01-20, 17:31, Pierre-Louis Bossart wrote: > > Fix previous update, bad git merge likely. oops. > > Applied, thanks Btw I still have these warns on my next with W=1 drivers/soundwire/intel_init.c:193:7: warning: no previous prototype for ‘sdw_intel_init’ [-Wmissing-prototypes] void *sdw_intel_init(acpi_handle *parent_handle, struct sdw_intel_res *res) ^~~~~~~~~~~~~~ drivers/soundwire/cadence_master.c:1022: warning: Function parameter or member 'clock_stop_exit' not described in 'sdw_cdns_init' LD [M] drivers/soundwire/soundwire-cadence.o drivers/soundwire/intel_init.c:214: warning: Function parameter or member 'ctx' not described in 'sdw_intel_exit' drivers/soundwire/intel_init.c:214: warning: Excess function parameter 'arg' description in 'sdw_intel_exit'
On 1/16/20 6:09 AM, Vinod Koul wrote: > On 16-01-20, 17:35, Vinod Koul wrote: >> On 14-01-20, 17:31, Pierre-Louis Bossart wrote: >>> Fix previous update, bad git merge likely. oops. >> >> Applied, thanks > > Btw I still have these warns on my next with W=1 > > drivers/soundwire/intel_init.c:193:7: warning: no previous prototype for ‘sdw_intel_init’ [-Wmissing-prototypes] > void *sdw_intel_init(acpi_handle *parent_handle, struct sdw_intel_res *res) > ^~~~~~~~~~~~~~ > drivers/soundwire/cadence_master.c:1022: warning: Function parameter or member 'clock_stop_exit' not described in 'sdw_cdns_init' > LD [M] drivers/soundwire/soundwire-cadence.o > drivers/soundwire/intel_init.c:214: warning: Function parameter or member 'ctx' not described in 'sdw_intel_exit' > drivers/soundwire/intel_init.c:214: warning: Excess function parameter 'arg' description in 'sdw_intel_exit' All of this is replaced by new code already submitted for review. try our SOF upstream/soundwire branch and you'll see.
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 12d3ac56e01b..9bec270d0fa4 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -819,7 +819,6 @@ EXPORT_SYMBOL(sdw_cdns_thread); /** * sdw_cdns_exit_reset() - Program reset parameters and start bus operations * @cdns: Cadence instance - * @state: True if we are trying to enable interrupt. */ int sdw_cdns_exit_reset(struct sdw_cdns *cdns) { @@ -846,6 +845,7 @@ EXPORT_SYMBOL(sdw_cdns_exit_reset); /** * sdw_cdns_enable_interrupt() - Enable SDW interrupts * @cdns: Cadence instance + * @state: True if we are trying to enable interrupt. */ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns, bool state) {
Fix previous update, bad git merge likely. oops. Fixes: 39737a313085fa ("soundwire: cadence: update kernel-doc parameter descriptions") 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(-)