File tree Expand file tree Collapse file tree 2 files changed +2
-14
lines changed Expand file tree Collapse file tree 2 files changed +2
-14
lines changed Original file line number Diff line number Diff line change @@ -965,24 +965,16 @@ EXPORT_SYMBOL_GPL(lp55xx_update_bits);
965
965
bool lp55xx_is_extclk_used (struct lp55xx_chip * chip )
966
966
{
967
967
struct clk * clk ;
968
- int err ;
969
968
970
- clk = devm_clk_get (& chip -> cl -> dev , "32k_clk" );
969
+ clk = devm_clk_get_enabled (& chip -> cl -> dev , "32k_clk" );
971
970
if (IS_ERR (clk ))
972
971
goto use_internal_clk ;
973
972
974
- err = clk_prepare_enable (clk );
975
- if (err )
973
+ if (clk_get_rate (clk ) != LP55XX_CLK_32K )
976
974
goto use_internal_clk ;
977
975
978
- if (clk_get_rate (clk ) != LP55XX_CLK_32K ) {
979
- clk_disable_unprepare (clk );
980
- goto use_internal_clk ;
981
- }
982
-
983
976
dev_info (& chip -> cl -> dev , "%dHz external clock used\n" , LP55XX_CLK_32K );
984
977
985
- chip -> clk = clk ;
986
978
return true;
987
979
988
980
use_internal_clk :
@@ -995,9 +987,6 @@ static void lp55xx_deinit_device(struct lp55xx_chip *chip)
995
987
{
996
988
struct lp55xx_platform_data * pdata = chip -> pdata ;
997
989
998
- if (chip -> clk )
999
- clk_disable_unprepare (chip -> clk );
1000
-
1001
990
if (pdata -> enable_gpiod )
1002
991
gpiod_set_value (pdata -> enable_gpiod , 0 );
1003
992
}
Original file line number Diff line number Diff line change @@ -193,7 +193,6 @@ struct lp55xx_engine {
193
193
*/
194
194
struct lp55xx_chip {
195
195
struct i2c_client * cl ;
196
- struct clk * clk ;
197
196
struct lp55xx_platform_data * pdata ;
198
197
struct mutex lock ; /* lock for user-space interface */
199
198
int num_leds ;
You can’t perform that action at this time.
0 commit comments