linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] i2c: mv64xxx: Fix compilation breakage
Date: Fri, 7 Mar 2014 16:08:36 +0000	[thread overview]
Message-ID: <20140307160836.GM21483@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1394204370-22979-1-git-send-email-maxime.ripard@free-electrons.com>

On Fri, Mar 07, 2014 at 03:59:30PM +0100, Maxime Ripard wrote:
> @@ -900,7 +902,8 @@ mv64xxx_i2c_probe(struct platform_device *pd)
>  exit_free_irq:
>  	free_irq(drv_data->irq, drv_data);
>  exit_reset:
> -	if (pd->dev.of_node && !IS_ERR(drv_data->rstc))
> +	if (pd->dev.of_node && IS_ENABLED(CONFIG_RESET_CONTROLLER) &&
> +	    !IS_ERR(drv_data->rstc))
>  		reset_control_assert(drv_data->rstc);

Another question is... why do we need to check pd->dev.of_node here?
If CONFIG_RESET_CONTROLLER is set, we always try to get the reset
controller node, so drv_data->rstc is either going to be a valid
pointer, or it's going to be an error pointer - neither
reset_control_get() nor devm_reset_control_get return NULL.

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.

  reply	other threads:[~2014-03-07 16:08 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07 14:59 [PATCH] i2c: mv64xxx: Fix compilation breakage Maxime Ripard
2014-03-07 16:08 ` Russell King - ARM Linux [this message]
2014-03-07 17:19   ` Maxime Ripard
2014-03-07 17:29     ` Wolfram Sang
2014-03-07 17:52       ` Maxime Ripard
2014-03-10 10:58   ` Maxime Ripard
2014-03-10 11:29     ` Russell King - ARM Linux
2014-03-21 15:49       ` Paul Gortmaker
2014-03-21 19:17         ` Maxime Ripard
2014-03-22 11:11           ` Arnd Bergmann
2014-03-24  9:41             ` Maxime Ripard
2014-03-28  7:48               ` Wolfram Sang
2014-03-24 13:33           ` Wolfram Sang
2014-03-24 14:03             ` Gregory CLEMENT

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=20140307160836.GM21483@n2100.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).