projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
[deliverable/linux.git]
/
drivers
/
spi
/
spi-s3c64xx.c
diff --git
a/drivers/spi/spi-s3c64xx.c
b/drivers/spi/spi-s3c64xx.c
index 63e2070c6c14aa8e39a64a850248e07a38546708..2465d6d35b068fa5158073a515ca562973ffc239 100644
(file)
--- a/
drivers/spi/spi-s3c64xx.c
+++ b/
drivers/spi/spi-s3c64xx.c
@@
-1275,7
+1275,7
@@
static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
#else
static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
{
#else
static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
{
- return dev
->platform_data
;
+ return dev
_get_platdata(dev)
;
}
#endif
}
#endif
@@
-1300,7
+1300,7
@@
static int s3c64xx_spi_probe(struct platform_device *pdev)
struct resource *mem_res;
struct resource *res;
struct s3c64xx_spi_driver_data *sdd;
struct resource *mem_res;
struct resource *res;
struct s3c64xx_spi_driver_data *sdd;
- struct s3c64xx_spi_info *sci =
pdev->dev.platform_data
;
+ struct s3c64xx_spi_info *sci =
dev_get_platdata(&pdev->dev)
;
struct spi_master *master;
int ret, irq;
char clk_name[16];
struct spi_master *master;
int ret, irq;
char clk_name[16];
This page took
0.025112 seconds
and
5
git commands to generate.