Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC Software Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Projects
FMC Software Support
Commits
116839de
Commit
116839de
authored
Sep 26, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v1.0.0'
parents
9a1d8ead
50d52004
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
9 deletions
+16
-9
CHANGELOG
CHANGELOG
+11
-2
fmc-core.c
drivers/fmc/fmc-core.c
+2
-4
fmc-eeprom.c
drivers/fmc/fmc-eeprom.c
+3
-3
No files found.
CHANGELOG
View file @
116839de
=========
Changelog
=========
[1.0.0] - 2019-09-26
====================
Changes
-------
- better ``printk()`` output
- better use of ``memcpy()``
[0.9.1] - 2019-09-09
--------------------
====================
Added
~~~~~
-----
- First stable implementation of FMC framework
drivers/fmc/fmc-core.c
View file @
116839de
...
...
@@ -301,14 +301,12 @@ int fmc_carrier_register(struct device *parent,
for
(
i
=
0
;
i
<
carrier
->
slot_nr
;
++
i
)
{
carrier
->
slot
[
i
]
=
fmc_carrier_add_slot
(
carrier
,
&
slot_info
[
i
]);
if
(
IS_ERR_OR_NULL
(
carrier
->
slot
[
i
]))
{
dev_err
(
&
carrier
->
dev
,
"Failed to
add slot %d
\n
"
,
i
);
dev_err
(
&
carrier
->
dev
,
"Failed to add slot %d
\n
"
,
i
);
err
=
-
EINVAL
;
goto
err_slot
;
}
}
dev_info
(
parent
,
"FMC carrier registration: success
\n
"
);
return
0
;
err_slot:
...
...
@@ -321,7 +319,7 @@ err_name:
err_alloc:
ida_simple_remove
(
&
fmc_carrier_ida
,
id
);
err_ida:
dev_err
(
parent
,
"FMC carrier registration: fail
\n
"
);
dev_err
(
parent
,
"FMC carrier registration: fail
ed %d
\n
"
,
err
);
return
err
;
}
EXPORT_SYMBOL
(
fmc_carrier_register
);
...
...
drivers/fmc/fmc-eeprom.c
View file @
116839de
...
...
@@ -56,7 +56,7 @@ static void fmc_slot_eeprom_init_default(struct fmc_slot *slot,
{
memset
(
info
,
0
,
sizeof
(
*
info
));
fmc_slot_eeprom_init
(
slot
,
info
,
FMC_EEPROM_TYPE_DEFAULT
);
memcpy
(
&
slot
->
at24_data
,
&
at24_24c02
,
sizeof
(
at24_24c02
));
memcpy
(
&
slot
->
at24_data
,
&
at24_24c02
,
sizeof
(
slot
->
at24_data
));
slot
->
at24_data
.
context
=
slot
;
}
...
...
@@ -196,8 +196,8 @@ int fmc_slot_eeprom_type_set(struct fmc_slot *slot, const char *type)
}
memset
(
&
i2c_info
,
0
,
sizeof
(
struct
i2c_board
_info
));
memset
(
&
slot
->
at24_data
,
0
,
sizeof
(
s
truct
at24_platform
_data
));
memset
(
&
i2c_info
,
0
,
sizeof
(
i2c
_info
));
memset
(
&
slot
->
at24_data
,
0
,
sizeof
(
s
lot
->
at24
_data
));
len
=
(
len
*
1024
)
/
8
;
/*
...
...
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