Showing the changes to include/linux (4 of 89 files). Show all
Unified · Split
| @@ -553,7 +553,6 @@ struct palmas_pmic { · 552 unmodified lines | ||
| 553 | 553 | struct palmas *palmas; |
| 554 | 554 | struct device *dev; |
| 555 | 555 | struct regulator_desc desc[PALMAS_NUM_REGS]; |
| 556 | − struct regulator_dev *rdev[PALMAS_NUM_REGS]; | |
| 557 | 556 | struct mutex mutex; |
| 558 | 557 | |
| 559 | 558 | int smps123; |
| @@ -1213,6 +1213,6 @@ · 1212 unmodified lines | ||
| 1213 | 1213 | #define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */ |
| 1214 | 1214 | |
| 1215 | 1215 | #define WM831X_ISINK_MAX_ISEL 55 |
| 1216 | −extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1]; | |
| 1216 | +extern const unsigned int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1]; | |
| 1217 | 1217 | |
| 1218 | 1218 | #endif |
| @@ -923,12 +923,4 @@ struct wm8400 { · 922 unmodified lines | ||
| 923 | 923 | #define WM8400_LINE_CMP_VTHD_SHIFT 0 /* LINE_CMP_VTHD - [3:0] */ |
| 924 | 924 | #define WM8400_LINE_CMP_VTHD_WIDTH 4 /* LINE_CMP_VTHD - [3:0] */ |
| 925 | 925 | |
| 926 | −int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data); | |
| 927 | − | |
| 928 | −static inline int wm8400_set_bits(struct wm8400 *wm8400, u8 reg, | |
| 929 | − u16 mask, u16 val) | |
| 930 | −{ | |
| 931 | − return regmap_update_bits(wm8400->regmap, reg, mask, val); | |
| 932 | −} | |
| 933 | − | |
| 934 | 926 | #endif |
| @@ -478,6 +478,11 @@ static inline int regulator_is_supported_voltage(struct regulator *regulator, · 477 unmodified lines | ||
| 478 | 478 | return 0; |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | +static inline unsigned int regulator_get_linear_step(struct regulator *regulator) | |
| 482 | +{ | |
| 483 | + return 0; | |
| 484 | +} | |
| 485 | + | |
| 481 | 486 | static inline int regulator_set_current_limit(struct regulator *regulator, |
| 482 | 487 | int min_uA, int max_uA) |
| 483 | 488 | { |