linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Richard Cochran <richardcochran@gmail.com>
To: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: "David S. Miller" <davem@davemloft.net>,
	netdev@vger.kernel.org, Mugunthan V N <mugunthanvnm@ti.com>,
	Sekhar Nori <nsekhar@ti.com>,
	linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	Rob Herring <robh+dt@kernel.org>,
	devicetree@vger.kernel.org,
	Murali Karicheri <m-karicheri2@ti.com>,
	Wingman Kwok <w-kwok2@ti.com>
Subject: Re: [PATCH  v2 07/13] net: ethernet: ti: cpts: rework initialization/deinitialization
Date: Tue, 29 Nov 2016 11:07:37 +0100	[thread overview]
Message-ID: <20161129100737.GF3110@localhost.localdomain> (raw)
In-Reply-To: <20161128230337.6731-8-grygorii.strashko@ti.com>

On Mon, Nov 28, 2016 at 05:03:31PM -0600, Grygorii Strashko wrote:
> +int cpts_register(struct cpts *cpts)
>  {
>  	int err, i;
>  
> -	cpts->info = cpts_info;
> -	spin_lock_init(&cpts->lock);
> -
> -	cpts->cc.read = cpts_systim_read;
> -	cpts->cc.mask = CLOCKSOURCE_MASK(32);
> -	cpts->cc_mult = mult;
> -	cpts->cc.mult = mult;
> -	cpts->cc.shift = shift;
> -
>  	INIT_LIST_HEAD(&cpts->events);
>  	INIT_LIST_HEAD(&cpts->pool);
>  	for (i = 0; i < CPTS_MAX_EVENTS; i++)
>  		list_add(&cpts->pool_data[i].list, &cpts->pool);
>  
> -	cpts_clk_init(dev, cpts);
> +	clk_enable(cpts->refclk);
> +
>  	cpts_write32(cpts, CPTS_EN, control);
>  	cpts_write32(cpts, TS_PEND_EN, int_enable);
>  
> +	cpts->cc.mult = cpts->cc_mult;

It is not clear why you set cc.mult in a different place than
cc.shift.  That isn't logical, but maybe later patches make it
clear...

>  	timecounter_init(&cpts->tc, &cpts->cc, ktime_to_ns(ktime_get_real()));
>  
> -	INIT_DELAYED_WORK(&cpts->overflow_work, cpts_overflow_check);
> -
> -	cpts->clock = ptp_clock_register(&cpts->info, dev);
> +	cpts->clock = ptp_clock_register(&cpts->info, cpts->dev);
>  	if (IS_ERR(cpts->clock)) {
>  		err = PTR_ERR(cpts->clock);
>  		cpts->clock = NULL;
> @@ -392,26 +364,74 @@ int cpts_register(struct device *dev, struct cpts *cpts,
>  	return 0;
>  
>  err_ptp:
> -	if (cpts->refclk)
> -		cpts_clk_release(cpts);
> +	clk_disable(cpts->refclk);
>  	return err;
>  }
>  EXPORT_SYMBOL_GPL(cpts_register);
>  
>  void cpts_unregister(struct cpts *cpts)
>  {
> -	if (cpts->clock) {
> -		ptp_clock_unregister(cpts->clock);
> -		cancel_delayed_work_sync(&cpts->overflow_work);
> -	}
> +	if (WARN_ON(!cpts->clock))
> +		return;
> +
> +	cancel_delayed_work_sync(&cpts->overflow_work);
> +
> +	ptp_clock_unregister(cpts->clock);
> +	cpts->clock = NULL;
>  
>  	cpts_write32(cpts, 0, int_enable);
>  	cpts_write32(cpts, 0, control);
>  
> -	if (cpts->refclk)
> -		cpts_clk_release(cpts);
> +	clk_disable(cpts->refclk);
>  }
>  EXPORT_SYMBOL_GPL(cpts_unregister);
>  
> +struct cpts *cpts_create(struct device *dev, void __iomem *regs,
> +			 u32 mult, u32 shift)
> +{
> +	struct cpts *cpts;
> +
> +	if (!regs || !dev)
> +		return ERR_PTR(-EINVAL);

There is no need for this test, as the caller will always pass valid
pointers.  (This isn't a user space library!)

Thanks,
Richard

  reply	other threads:[~2016-11-29 10:07 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-28 23:03 [PATCH v2 00/13] net: ethernet: ti: cpts: update and fixes Grygorii Strashko
2016-11-28 23:03 ` [PATCH v2 01/13] net: ethernet: ti: cpts: switch to readl/writel_relaxed() Grygorii Strashko
2016-11-29  9:38   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 02/13] net: ethernet: ti: allow cpts to be built separately Grygorii Strashko
2016-11-29  9:37   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 03/13] net: ethernet: ti: cpsw: minimize direct access to struct cpts Grygorii Strashko
2016-11-28 23:03 ` [PATCH v2 04/13] net: ethernet: ti: cpts: fix unbalanced clk api usage in cpts_register/unregister Grygorii Strashko
2016-11-29  9:48   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 05/13] net: ethernet: ti: cpts: fix registration order Grygorii Strashko
2016-11-29  9:48   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 06/13] net: ethernet: ti: cpts: disable cpts when unregistered Grygorii Strashko
2016-11-29  9:49   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 07/13] net: ethernet: ti: cpts: rework initialization/deinitialization Grygorii Strashko
2016-11-29 10:07   ` Richard Cochran [this message]
2016-11-29 15:50     ` Grygorii Strashko
2016-11-30 18:30       ` Grygorii Strashko
2016-11-28 23:03 ` [PATCH v2 08/13] net: ethernet: ti: cpts: move dt props parsing to cpts driver Grygorii Strashko
2016-11-29 10:11   ` Richard Cochran
2016-11-29 15:54     ` Grygorii Strashko
2016-11-28 23:03 ` [PATCH v2 09/13] net: ethernet: ti: cpts: clean up event list if event pool is empty Grygorii Strashko
2016-11-29 10:13   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 10/13] net: ethernet: ti: cpts: drop excessive writes to CTRL and INT_EN regs Grygorii Strashko
2016-11-29 10:14   ` Richard Cochran
2016-11-28 23:03 ` [PATCH v2 11/13] clocksource: export the clocks_calc_mult_shift to use by timestamp code Grygorii Strashko
2016-11-29  9:08   ` Thomas Gleixner
2016-11-28 23:03 ` [PATCH v2 12/13] net: ethernet: ti: cpts: calc mult and shift from refclk freq Grygorii Strashko
2016-11-29 10:34   ` Richard Cochran
2016-11-29 16:22     ` Grygorii Strashko
2016-11-28 23:03 ` [PATCH v2 13/13] net: ethernet: ti: cpts: fix overflow check period Grygorii Strashko
2016-11-30  9:12   ` Richard Cochran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161129100737.GF3110@localhost.localdomain \
    --to=richardcochran@gmail.com \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=grygorii.strashko@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=m-karicheri2@ti.com \
    --cc=mugunthanvnm@ti.com \
    --cc=netdev@vger.kernel.org \
    --cc=nsekhar@ti.com \
    --cc=robh+dt@kernel.org \
    --cc=w-kwok2@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).