diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-21 11:09:46 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-21 11:09:46 +0900 |
| commit | 3afa24f7ad0a1ab5478f1e9a6c4df1acf52171d1 (patch) | |
| tree | d8a4bebef173659a9f1605fec1c7eab06a016583 /drivers/base/regmap/internal.h | |
| parent | 869e4a5f5848f6308cc5651d4bdc3e545d676b98 (diff) | |
| parent | 0d4529c534c1c664f25088eb5f5b4d7ce0ee2510 (diff) | |
Merge branch 'topic/lock' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-table
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 ac869d28d5b..2cd01b57b1c 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@ -31,14 +31,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 */ |