projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into...
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-omap-100k.c
diff --git
a/drivers/spi/spi-omap-100k.c
b/drivers/spi/spi-omap-100k.c
index
69ecf05
..
b6ed82b
100644
(file)
--- a/
drivers/spi/spi-omap-100k.c
+++ b/
drivers/spi/spi-omap-100k.c
@@
-457,7
+457,7
@@
static int omap1_spi100k_probe(struct platform_device *pdev)
goto err;
}
- status =
spi_register_master(
master);
+ status =
devm_spi_register_master(&pdev->dev,
master);
if (status < 0)
goto err;
@@
-485,8
+485,6
@@
static int omap1_spi100k_remove(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- spi_unregister_master(master);
-
return 0;
}