summaryrefslogtreecommitdiff
path: root/drivers/media/radio/si4713/si4713.h
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2014-10-21 19:07:00 +0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-14 23:00:50 +0300
commitd4471deceba46ea6fd60f7fa5e8da3fb72bbbe44 (patch)
tree7c8d4d6c40a6201a8160f3d5ddd47da221fa923a /drivers/media/radio/si4713/si4713.h
parentaa1b4da6af67d5c6a4e933c2d30890c6f282f505 (diff)
downloadlinux-d4471deceba46ea6fd60f7fa5e8da3fb72bbbe44.tar.xz
[media] si4713: switch to devm regulator API
This switches back to the normal regulator API (but use managed variant) in preparation for device tree support. Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> [hans.verkuil@cisco.com: fixed two trival compiler warnings] Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/radio/si4713/si4713.h')
-rw-r--r--drivers/media/radio/si4713/si4713.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/radio/si4713/si4713.h b/drivers/media/radio/si4713/si4713.h
index ed700e387605..ed28ed27c95f 100644
--- a/drivers/media/radio/si4713/si4713.h
+++ b/drivers/media/radio/si4713/si4713.h
@@ -190,8 +190,6 @@
#define MIN_ACOMP_THRESHOLD (-40)
#define MAX_ACOMP_GAIN 20
-#define SI4713_NUM_SUPPLIES 2
-
/*
* si4713_device - private data
*/
@@ -236,8 +234,8 @@ struct si4713_device {
struct v4l2_ctrl *tune_ant_cap;
};
struct completion work;
- unsigned supplies;
- struct regulator_bulk_data supply_data[SI4713_NUM_SUPPLIES];
+ struct regulator *vdd;
+ struct regulator *vio;
int gpio_reset;
u32 power_state;
u32 rds_enabled;