Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ebe0bdf9
Commit
ebe0bdf9
authored
Jan 23, 2020
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/topic/equal' into regulator-next
parents
9909f798
0468e667
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
drivers/regulator/helpers.c
drivers/regulator/helpers.c
+14
-0
include/linux/regulator/consumer.h
include/linux/regulator/consumer.h
+7
-0
No files found.
drivers/regulator/helpers.c
View file @
ebe0bdf9
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
#include <linux/regulator/driver.h>
#include <linux/regulator/driver.h>
#include <linux/module.h>
#include <linux/module.h>
#include "internal.h"
/**
/**
* regulator_is_enabled_regmap - standard is_enabled() for regmap users
* regulator_is_enabled_regmap - standard is_enabled() for regmap users
*
*
...
@@ -881,3 +883,15 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
...
@@ -881,3 +883,15 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
consumers
[
i
].
supply
=
supply_names
[
i
];
consumers
[
i
].
supply
=
supply_names
[
i
];
}
}
EXPORT_SYMBOL_GPL
(
regulator_bulk_set_supply_names
);
EXPORT_SYMBOL_GPL
(
regulator_bulk_set_supply_names
);
/**
* regulator_is_equal - test whether two regulators are the same
*
* @reg1: first regulator to operate on
* @reg2: second regulator to operate on
*/
bool
regulator_is_equal
(
struct
regulator
*
reg1
,
struct
regulator
*
reg2
)
{
return
reg1
->
rdev
==
reg2
->
rdev
;
}
EXPORT_SYMBOL_GPL
(
regulator_is_equal
);
include/linux/regulator/consumer.h
View file @
ebe0bdf9
...
@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
...
@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
const
char
*
const
*
supply_names
,
const
char
*
const
*
supply_names
,
unsigned
int
num_supplies
);
unsigned
int
num_supplies
);
bool
regulator_is_equal
(
struct
regulator
*
reg1
,
struct
regulator
*
reg2
);
#else
#else
/*
/*
...
@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
...
@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
{
{
}
}
static
inline
bool
regulator_is_equal
(
struct
regulator
*
reg1
,
struct
regulator
*
reg2
)
{
return
false
;
}
#endif
#endif
static
inline
int
regulator_set_voltage_triplet
(
struct
regulator
*
regulator
,
static
inline
int
regulator_set_voltage_triplet
(
struct
regulator
*
regulator
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment