Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FMC Software Support
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
FMC Software Support
Commits
63e83890
Commit
63e83890
authored
5 years ago
by
Federico Vaga
Browse files
Options
Downloads
Patches
Plain Diff
fmc: fixes from coccicheck and checkpatch
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
24ce6c09
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/fmc/fmc-core.c
+5
-1
5 additions, 1 deletion
drivers/fmc/fmc-core.c
drivers/fmc/fru-parse.c
+1
-1
1 addition, 1 deletion
drivers/fmc/fru-parse.c
with
6 additions
and
2 deletions
drivers/fmc/fmc-core.c
+
5
−
1
View file @
63e83890
...
...
@@ -207,7 +207,7 @@ err_name:
err_i2c:
devm_kfree
(
&
carrier
->
dev
,
slot
);
err_alloc:
ida_simple_remove
(
&
fmc_slot_ida
,
slot
->
dev
.
id
);
ida_simple_remove
(
&
fmc_slot_ida
,
id
);
err_ida:
return
ERR_PTR
(
err
);
}
...
...
@@ -219,11 +219,15 @@ err_ida:
*/
static
void
fmc_carrier_del_slot
(
struct
fmc_slot
*
slot
)
{
int
id
;
if
(
IS_ERR_OR_NULL
(
slot
))
return
;
id
=
slot
->
dev
.
id
;
fmc_slot_eeprom_del
(
slot
);
device_unregister
(
&
slot
->
dev
);
ida_simple_remove
(
&
fmc_slot_ida
,
id
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
drivers/fmc/fru-parse.c
+
1
−
1
View file @
63e83890
...
...
@@ -6,7 +6,7 @@
#include
<linux/version.h>
#if
LINUX_VERSION_CODE <
KERNEL_VERSION(3,11,0)
#if KERNEL_VERSION(3,
11,
0)
> LINUX_VERSION_CODE
/*
* On kernel 3.11 and greater this is included
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment