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
a560ae55
Commit
a560ae55
authored
Oct 29, 2018
by
Wolfram Sang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'i2c-mux/for-next' of
https://github.com/peda-r/i2c-mux
into i2c/for-4.20-fixed
parents
a676973e
7451dc60
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/i2c/muxes/i2c-mux-ltc4306.c
drivers/i2c/muxes/i2c-mux-ltc4306.c
+1
-1
drivers/i2c/muxes/i2c-mux-mlxcpld.c
drivers/i2c/muxes/i2c-mux-mlxcpld.c
+1
-1
drivers/i2c/muxes/i2c-mux-pca954x.c
drivers/i2c/muxes/i2c-mux-pca954x.c
+1
-1
No files found.
drivers/i2c/muxes/i2c-mux-ltc4306.c
View file @
a560ae55
...
...
@@ -208,7 +208,7 @@ MODULE_DEVICE_TABLE(of, ltc4306_of_match);
static
int
ltc4306_probe
(
struct
i2c_client
*
client
)
{
struct
i2c_adapter
*
adap
=
to_i2c_adapter
(
client
->
dev
.
parent
)
;
struct
i2c_adapter
*
adap
=
client
->
adapter
;
const
struct
chip_desc
*
chip
;
struct
i2c_mux_core
*
muxc
;
struct
ltc4306
*
data
;
...
...
drivers/i2c/muxes/i2c-mux-mlxcpld.c
View file @
a560ae55
...
...
@@ -132,7 +132,7 @@ static int mlxcpld_mux_deselect(struct i2c_mux_core *muxc, u32 chan)
static
int
mlxcpld_mux_probe
(
struct
i2c_client
*
client
,
const
struct
i2c_device_id
*
id
)
{
struct
i2c_adapter
*
adap
=
to_i2c_adapter
(
client
->
dev
.
parent
)
;
struct
i2c_adapter
*
adap
=
client
->
adapter
;
struct
mlxcpld_mux_plat_data
*
pdata
=
dev_get_platdata
(
&
client
->
dev
);
struct
i2c_mux_core
*
muxc
;
int
num
,
force
;
...
...
drivers/i2c/muxes/i2c-mux-pca954x.c
View file @
a560ae55
...
...
@@ -347,7 +347,7 @@ static void pca954x_cleanup(struct i2c_mux_core *muxc)
static
int
pca954x_probe
(
struct
i2c_client
*
client
,
const
struct
i2c_device_id
*
id
)
{
struct
i2c_adapter
*
adap
=
to_i2c_adapter
(
client
->
dev
.
parent
)
;
struct
i2c_adapter
*
adap
=
client
->
adapter
;
struct
pca954x_platform_data
*
pdata
=
dev_get_platdata
(
&
client
->
dev
);
struct
device
*
dev
=
&
client
->
dev
;
struct
device_node
*
np
=
dev
->
of_node
;
...
...
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