Commit 31cecb6b authored by Paul Cercueil's avatar Paul Cercueil Committed by Greg Kroah-Hartman
Browse files

usb: musb: jz4740: Constify jz4740_musb_pdata struct 



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: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Link: https://lore.kernel.org/r/20200115132547.364-14-b-liu@ti.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b70331b

drivers/usb/musb/jz4740.c

+7 −8
Original line number Diff line number Diff line
@@ -66,11 +66,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;
@@ -107,10 +102,16 @@ static const struct musb_platform_ops jz4740_musb_ops = { 
	.init		= jz4740_musb_init,

};



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;
@@ -144,8 +145,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,