From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63FF3C7618B for ; Fri, 26 Jul 2019 15:52:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4084521873 for ; Fri, 26 Jul 2019 15:52:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727579AbfGZPwT (ORCPT ); Fri, 26 Jul 2019 11:52:19 -0400 Received: from mga03.intel.com ([134.134.136.65]:57643 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725970AbfGZPwS (ORCPT ); Fri, 26 Jul 2019 11:52:18 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2019 08:52:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,311,1559545200"; d="scan'208";a="172261394" Received: from gliakhov-mobl2.ger.corp.intel.com (HELO ubuntu) ([10.249.35.244]) by fmsmga007.fm.intel.com with ESMTP; 26 Jul 2019 08:52:15 -0700 Date: Fri, 26 Jul 2019 17:52:14 +0200 From: Guennadi Liakhovetski To: Pierre-Louis Bossart Cc: alsa-devel@alsa-project.org, tiwai@suse.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, vkoul@kernel.org, broonie@kernel.org, srinivas.kandagatla@linaro.org, jank@cadence.com, slawomir.blauciak@intel.com, Sanyog Kale Subject: Re: [alsa-devel] [RFC PATCH 35/40] soundwire: intel: export helper to exit reset Message-ID: <20190726155213.GK16003@ubuntu> References: <20190725234032.21152-1-pierre-louis.bossart@linux.intel.com> <20190725234032.21152-36-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190725234032.21152-36-pierre-louis.bossart@linux.intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 25, 2019 at 06:40:27PM -0500, Pierre-Louis Bossart wrote: > Signed-off-by: Pierre-Louis Bossart > --- > drivers/soundwire/cadence_master.c | 9 +++++++-- > drivers/soundwire/cadence_master.h | 1 + > drivers/soundwire/intel.c | 4 ++++ > 3 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c > index 4a189e487830..f486fe15fb46 100644 > --- a/drivers/soundwire/cadence_master.c > +++ b/drivers/soundwire/cadence_master.c > @@ -780,7 +780,11 @@ EXPORT_SYMBOL(sdw_cdns_thread); > * init routines > */ > > -static int do_reset(struct sdw_cdns *cdns) > +/** > + * sdw_cdns_exit_reset() - Program reset parameters and start bus operations > + * @cdns: Cadence instance > + */ > +int sdw_cdns_exit_reset(struct sdw_cdns *cdns) > { > int ret; > > @@ -804,6 +808,7 @@ static int do_reset(struct sdw_cdns *cdns) > > return ret; > } > +EXPORT_SYMBOL(sdw_cdns_exit_reset); > > /** > * sdw_cdns_enable_interrupt() - Enable SDW interrupts and update config > @@ -839,7 +844,7 @@ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns) > > cdns_writel(cdns, CDNS_MCP_INTMASK, mask); > > - return do_reset(cdns); > + return 0; > } > EXPORT_SYMBOL(sdw_cdns_enable_interrupt); > > diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h > index de97bc22acb7..2b551f9226f3 100644 > --- a/drivers/soundwire/cadence_master.h > +++ b/drivers/soundwire/cadence_master.h > @@ -161,6 +161,7 @@ irqreturn_t sdw_cdns_thread(int irq, void *dev_id); > int sdw_cdns_init(struct sdw_cdns *cdns); > int sdw_cdns_pdi_init(struct sdw_cdns *cdns, > struct sdw_cdns_stream_config config); > +int sdw_cdns_exit_reset(struct sdw_cdns *cdns); > int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns); > > void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root); > diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c > index a976480d6f36..9ebe38e4d979 100644 > --- a/drivers/soundwire/intel.c > +++ b/drivers/soundwire/intel.c > @@ -1112,6 +1112,8 @@ static int intel_probe(struct platform_device *pdev) > > ret = sdw_cdns_enable_interrupt(&sdw->cdns); > > + ret = sdw_cdns_exit_reset(&sdw->cdns); This isn't something, that this patch changes, but if the return value above is ignored, maybe no need to assign it at all? Thanks Guennadi > + > /* Register DAIs */ > ret = intel_register_dai(sdw); > if (ret) { > @@ -1199,6 +1201,8 @@ static int intel_resume(struct device *dev) > > sdw_cdns_enable_interrupt(&sdw->cdns); > > + ret = sdw_cdns_exit_reset(&sdw->cdns); > + > return ret; > } > > -- > 2.20.1 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel