diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 12:39:30 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 12:39:30 +0900 |
| commit | db760fbecd3d609098ef4121d7988ff2a5db15d1 (patch) | |
| tree | ff4d9bc553848e796f0b099343d7f640acf4fbcb /drivers/base/regmap/internal.h | |
| parent | 4d348e6e0a35cd1b40196a463f1159ae5d582770 (diff) | |
| parent | 0d4529c534c1c664f25088eb5f5b4d7ce0ee2510 (diff) | |
| download | kernel_goldelico_gta04-db760fbecd3d609098ef4121d7988ff2a5db15d1.zip kernel_goldelico_gta04-db760fbecd3d609098ef4121d7988ff2a5db15d1.tar.gz kernel_goldelico_gta04-db760fbecd3d609098ef4121d7988ff2a5db15d1.tar.bz2 | |
Merge remote-tracking branch 'regmap/topic/lock' into regmap-next
Diffstat (limited to 'drivers/base/regmap/internal.h')
| -rw-r--r-- | drivers/base/regmap/internal.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 9c3b0e7..0fadeba 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@ -39,14 +39,12 @@ struct regmap_format { unsigned int (*parse_val)(void *buf); }; -typedef void (*regmap_lock)(struct regmap *map); -typedef void (*regmap_unlock)(struct regmap *map); - struct regmap { struct mutex mutex; spinlock_t spinlock; regmap_lock lock; regmap_unlock unlock; + void *lock_arg; /* This is passed to lock/unlock functions */ struct device *dev; /* Device we do I/O on */ void *work_buf; /* Scratch buffer used to format I/O */ |