lkml.org 
[lkml]   [2019]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/6] usb: musb: jz4740: Constify jz4740_musb_pdata struct
Date
By moving around the jz4740_musb_pdata structure, we can have the
.platform_ops field initialized, so that we don't have to initialize it
manually in the probe function. Therefore, the struct can be const now.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/usb/musb/jz4740.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index b31b028e5ee7..3410e6b01bac 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -72,11 +72,6 @@ static const struct musb_hdrc_config jz4740_musb_config = {
.fifo_cfg_size = ARRAY_SIZE(jz4740_musb_fifo_cfg),
};

-static struct musb_hdrc_platform_data jz4740_musb_platform_data = {
- .mode = MUSB_PERIPHERAL,
- .config = &jz4740_musb_config,
-};
-
static int jz4740_musb_init(struct musb *musb)
{
struct device *dev = musb->controller->parent;
@@ -114,10 +109,16 @@ static const struct musb_platform_ops jz4740_musb_ops = {
#endif
};

+static const struct musb_hdrc_platform_data jz4740_musb_pdata = {
+ .mode = MUSB_PERIPHERAL,
+ .config = &jz4740_musb_config,
+ .platform_ops = &jz4740_musb_ops,
+};
+
static int jz4740_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct musb_hdrc_platform_data *pdata = &jz4740_musb_platform_data;
+ const struct musb_hdrc_platform_data *pdata = &jz4740_musb_pdata;
struct platform_device *musb;
struct jz4740_glue *glue;
struct clk *clk;
@@ -153,8 +154,6 @@ static int jz4740_probe(struct platform_device *pdev)
glue->musb = musb;
glue->clk = clk;

- pdata->platform_ops = &jz4740_musb_ops;
-
platform_set_drvdata(pdev, glue);

ret = platform_device_add_resources(musb, pdev->resource,
--
2.24.0
\
 
 \ /
  Last update: 2019-12-14 23:12    [W:0.038 / U:7.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site