Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
plat-samsung
/
adc.c
diff --git
a/kernel/arch/arm/plat-samsung/adc.c
b/kernel/arch/arm/plat-samsung/adc.c
index
e2be70d
..
efa6e85
100644
(file)
--- a/
kernel/arch/arm/plat-samsung/adc.c
+++ b/
kernel/arch/arm/plat-samsung/adc.c
@@
-389,7
+389,7
@@
static int s3c_adc_probe(struct platform_device *pdev)
if (ret)
return ret;
if (ret)
return ret;
- clk_enable(adc->clk);
+ clk_
prepare_
enable(adc->clk);
tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
@@
-413,7
+413,7
@@
static int s3c_adc_remove(struct platform_device *pdev)
{
struct adc_device *adc = platform_get_drvdata(pdev);
{
struct adc_device *adc = platform_get_drvdata(pdev);
- clk_disable(adc->clk);
+ clk_disable
_unprepare
(adc->clk);
regulator_disable(adc->vdd);
return 0;
regulator_disable(adc->vdd);
return 0;
@@
-475,7
+475,7
@@
static int s3c_adc_resume(struct device *dev)
#define s3c_adc_resume NULL
#endif
#define s3c_adc_resume NULL
#endif
-static struct platform_device_id s3c_adc_driver_ids[] = {
+static
const
struct platform_device_id s3c_adc_driver_ids[] = {
{
.name = "s3c24xx-adc",
.driver_data = TYPE_ADCV1,
{
.name = "s3c24xx-adc",
.driver_data = TYPE_ADCV1,