projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'riscv/for-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...
[linux-2.6-block.git]
/
drivers
/
spi
/
spi-st-ssc4.c
diff --git
a/drivers/spi/spi-st-ssc4.c
b/drivers/spi/spi-st-ssc4.c
index 840a6bf81336d50374b083cf62f8464054bdfb53..0c24c494f3865ff4ce2defd0eba1b46876a46c7c 100644
(file)
--- a/
drivers/spi/spi-st-ssc4.c
+++ b/
drivers/spi/spi-st-ssc4.c
@@
-298,7
+298,6
@@
static int spi_st_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct spi_master *master;
{
struct device_node *np = pdev->dev.of_node;
struct spi_master *master;
- struct resource *res;
struct spi_st *spi_st;
int irq, ret = 0;
u32 var;
struct spi_st *spi_st;
int irq, ret = 0;
u32 var;
@@
-331,8
+330,7
@@
static int spi_st_probe(struct platform_device *pdev)
init_completion(&spi_st->done);
/* Get resources */
init_completion(&spi_st->done);
/* Get resources */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- spi_st->base = devm_ioremap_resource(&pdev->dev, res);
+ spi_st->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(spi_st->base)) {
ret = PTR_ERR(spi_st->base);
goto clk_disable;
if (IS_ERR(spi_st->base)) {
ret = PTR_ERR(spi_st->base);
goto clk_disable;