diff options
Diffstat (limited to 'drivers/iio/adc/xilinx-xadc-core.c')
| -rw-r--r-- | drivers/iio/adc/xilinx-xadc-core.c | 18 | 
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index 1b247722ba25..292f2892d223 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1296,13 +1296,6 @@ static const char * const xadc_type_names[] = {  	[XADC_TYPE_US] = "xilinx-system-monitor",  }; -static void xadc_clk_disable_unprepare(void *data) -{ -	struct clk *clk = data; - -	clk_disable_unprepare(clk); -} -  static void xadc_cancel_delayed_work(void *data)  {  	struct delayed_work *work = data; @@ -1374,19 +1367,10 @@ static int xadc_probe(struct platform_device *pdev)  		}  	} -	xadc->clk = devm_clk_get(dev, NULL); +	xadc->clk = devm_clk_get_enabled(dev, NULL);  	if (IS_ERR(xadc->clk))  		return PTR_ERR(xadc->clk); -	ret = clk_prepare_enable(xadc->clk); -	if (ret) -		return ret; - -	ret = devm_add_action_or_reset(dev, -				       xadc_clk_disable_unprepare, xadc->clk); -	if (ret) -		return ret; -  	/*  	 * Make sure not to exceed the maximum samplerate since otherwise the  	 * resulting interrupt storm will soft-lock the system.  |