summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-03-30 02:45:56 -0400
committerBoris Brezillon <boris.brezillon@free-electrons.com>2017-04-25 08:18:36 -0400
commit3f5c35819fc37d5f35680a55327c940b6e8fad41 (patch)
tree6bca99b50404e2dc059c9d933aa74bc2f3d5e14f /drivers/mtd/nand
parent60d920d32ca40660e382cf9ccbc236599a49e607 (diff)
mtd: nand: denali_dt: use pdev instead of ofdev for platform_device
"pdev" is much more often used to point a platform_device, so this will help the driver code look consistent across the kernel. While we are here, fix "line over 80 characters" coding style violations. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r--drivers/mtd/nand/denali_dt.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c
index b8a8284d76cd..ada38636122c 100644
--- a/drivers/mtd/nand/denali_dt.c
+++ b/drivers/mtd/nand/denali_dt.c
@@ -46,7 +46,7 @@ static const struct of_device_id denali_nand_dt_ids[] = {
46}; 46};
47MODULE_DEVICE_TABLE(of, denali_nand_dt_ids); 47MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);
48 48
49static int denali_dt_probe(struct platform_device *ofdev) 49static int denali_dt_probe(struct platform_device *pdev)
50{ 50{
51 struct resource *denali_reg, *nand_data; 51 struct resource *denali_reg, *nand_data;
52 struct denali_dt *dt; 52 struct denali_dt *dt;
@@ -54,36 +54,38 @@ static int denali_dt_probe(struct platform_device *ofdev)
54 struct denali_nand_info *denali; 54 struct denali_nand_info *denali;
55 int ret; 55 int ret;
56 56
57 dt = devm_kzalloc(&ofdev->dev, sizeof(*dt), GFP_KERNEL); 57 dt = devm_kzalloc(&pdev->dev, sizeof(*dt), GFP_KERNEL);
58 if (!dt) 58 if (!dt)
59 return -ENOMEM; 59 return -ENOMEM;
60 denali = &dt->denali; 60 denali = &dt->denali;
61 61
62 data = of_device_get_match_data(&ofdev->dev); 62 data = of_device_get_match_data(&pdev->dev);
63 if (data) 63 if (data)
64 denali->caps = data->caps; 64 denali->caps = data->caps;
65 65
66 denali->platform = DT; 66 denali->platform = DT;
67 denali->dev = &ofdev->dev; 67 denali->dev = &pdev->dev;
68 denali->irq = platform_get_irq(ofdev, 0); 68 denali->irq = platform_get_irq(pdev, 0);
69 if (denali->irq < 0) { 69 if (denali->irq < 0) {
70 dev_err(&ofdev->dev, "no irq defined\n"); 70 dev_err(&pdev->dev, "no irq defined\n");
71 return denali->irq; 71 return denali->irq;
72 } 72 }
73 73
74 denali_reg = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "denali_reg"); 74 denali_reg = platform_get_resource_byname(pdev, IORESOURCE_MEM,
75 denali->flash_reg = devm_ioremap_resource(&ofdev->dev, denali_reg); 75 "denali_reg");
76 denali->flash_reg = devm_ioremap_resource(&pdev->dev, denali_reg);
76 if (IS_ERR(denali->flash_reg)) 77 if (IS_ERR(denali->flash_reg))
77 return PTR_ERR(denali->flash_reg); 78 return PTR_ERR(denali->flash_reg);
78 79
79 nand_data = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "nand_data"); 80 nand_data = platform_get_resource_byname(pdev, IORESOURCE_MEM,
80 denali->flash_mem = devm_ioremap_resource(&ofdev->dev, nand_data); 81 "nand_data");
82 denali->flash_mem = devm_ioremap_resource(&pdev->dev, nand_data);
81 if (IS_ERR(denali->flash_mem)) 83 if (IS_ERR(denali->flash_mem))
82 return PTR_ERR(denali->flash_mem); 84 return PTR_ERR(denali->flash_mem);
83 85
84 dt->clk = devm_clk_get(&ofdev->dev, NULL); 86 dt->clk = devm_clk_get(&pdev->dev, NULL);
85 if (IS_ERR(dt->clk)) { 87 if (IS_ERR(dt->clk)) {
86 dev_err(&ofdev->dev, "no clk available\n"); 88 dev_err(&pdev->dev, "no clk available\n");
87 return PTR_ERR(dt->clk); 89 return PTR_ERR(dt->clk);
88 } 90 }
89 clk_prepare_enable(dt->clk); 91 clk_prepare_enable(dt->clk);
@@ -92,7 +94,7 @@ static int denali_dt_probe(struct platform_device *ofdev)
92 if (ret) 94 if (ret)
93 goto out_disable_clk; 95 goto out_disable_clk;
94 96
95 platform_set_drvdata(ofdev, dt); 97 platform_set_drvdata(pdev, dt);
96 return 0; 98 return 0;
97 99
98out_disable_clk: 100out_disable_clk:
@@ -101,9 +103,9 @@ out_disable_clk:
101 return ret; 103 return ret;
102} 104}
103 105
104static int denali_dt_remove(struct platform_device *ofdev) 106static int denali_dt_remove(struct platform_device *pdev)
105{ 107{
106 struct denali_dt *dt = platform_get_drvdata(ofdev); 108 struct denali_dt *dt = platform_get_drvdata(pdev);
107 109
108 denali_remove(&dt->denali); 110 denali_remove(&dt->denali);
109 clk_disable_unprepare(dt->clk); 111 clk_disable_unprepare(dt->clk);