From: Maxime Ripard Date: Mon, 10 Mar 2014 11:12:10 +0000 (+0100) Subject: i2c: mv64xxx: Fix reset controller handling X-Git-Tag: v3.15-rc1~41^2~16 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2a67d0c27c5c018ed592116f1e1577aa041d73d;p=pandora-kernel.git i2c: mv64xxx: Fix reset controller handling The reset framework recently gained optional stubs when CONFIG_RESET_CONTROLLER is not selected. It also introduced a function reset_get_optional, that is also dummy-defined whenever the framework isn't enabled, for drivers that needs an optional reset controller. Switch to this function, since the mv64xxx driver is in this case. This also fixes a compilation breakage whenever the reset framework wasn't selected: drivers/i2c/busses/i2c-mv64xxx.c:771:2: error: implicit declaration of function 'devm_reset_control_get' While we're at it, remove the redundant test on dev.of_node surrounding the calls to reset framework functions, since it will either be a valid pointer, an error pointer in the case where we called reset_get_optional without an of_node pointer or if it failed, or NULL if we're not loaded through DT. Signed-off-by: Maxime Ripard Signed-off-by: Wolfram Sang --- Reading git-diff-tree failed