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
1f54f942
Commit
1f54f942
authored
Sep 01, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
parents
db04e170
c8b94d84
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
drivers/spi/spi-clps711x.c
drivers/spi/spi-clps711x.c
+0
-6
No files found.
drivers/spi/spi-clps711x.c
View file @
1f54f942
...
@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
...
@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
}
}
dev_err
(
&
pdev
->
dev
,
"Failed to register master
\n
"
);
dev_err
(
&
pdev
->
dev
,
"Failed to register master
\n
"
);
devm_free_irq
(
&
pdev
->
dev
,
IRQ_SSEOTI
,
hw
);
clk_out:
clk_out:
devm_clk_put
(
&
pdev
->
dev
,
hw
->
spi_clk
);
err_out:
err_out:
while
(
--
i
>=
0
)
while
(
--
i
>=
0
)
if
(
gpio_is_valid
(
hw
->
chipselect
[
i
]))
if
(
gpio_is_valid
(
hw
->
chipselect
[
i
]))
...
@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev)
...
@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev)
struct
spi_master
*
master
=
platform_get_drvdata
(
pdev
);
struct
spi_master
*
master
=
platform_get_drvdata
(
pdev
);
struct
spi_clps711x_data
*
hw
=
spi_master_get_devdata
(
master
);
struct
spi_clps711x_data
*
hw
=
spi_master_get_devdata
(
master
);
devm_free_irq
(
&
pdev
->
dev
,
IRQ_SSEOTI
,
hw
);
for
(
i
=
0
;
i
<
master
->
num_chipselect
;
i
++
)
for
(
i
=
0
;
i
<
master
->
num_chipselect
;
i
++
)
if
(
gpio_is_valid
(
hw
->
chipselect
[
i
]))
if
(
gpio_is_valid
(
hw
->
chipselect
[
i
]))
gpio_free
(
hw
->
chipselect
[
i
]);
gpio_free
(
hw
->
chipselect
[
i
]);
devm_clk_put
(
&
pdev
->
dev
,
hw
->
spi_clk
);
spi_unregister_master
(
master
);
spi_unregister_master
(
master
);
kfree
(
master
);
kfree
(
master
);
...
...
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