From: Stephen Warren Date: Mon, 29 Apr 2013 19:49:08 +0000 (+0000) Subject: staging: dwc2: add const to handling of dwc2_core_params X-Git-Tag: v3.11-rc1~158^2~733 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=90dbceafe8d812bde318c29ac844e57fb71c9418;p=cascardo%2Flinux.git staging: dwc2: add const to handling of dwc2_core_params Now the functions use proper const annotations, the global variable with default params can be marked const, which prevents these values from being changed for a specific device (in theory there could be multiple controllers with different settings, for example). Signed-off-by: Stephen Warren [matthijs@stdin.nl: Split patch from bigger patch, marked dwc2_module_params in pci.c as const and added commit message] Signed-off-by: Matthijs Kooijman Acked-by: Paul Zimmerman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dwc2/core.c b/drivers/staging/dwc2/core.c index 89b19d7804c8..ac8ed15064dc 100644 --- a/drivers/staging/dwc2/core.c +++ b/drivers/staging/dwc2/core.c @@ -2642,7 +2642,7 @@ int dwc2_set_param_otg_ver(struct dwc2_hsotg *hsotg, int val) * for the DWC_otg core. It returns non-0 if any parameters are invalid. */ int dwc2_set_parameters(struct dwc2_hsotg *hsotg, - struct dwc2_core_params *params) + const struct dwc2_core_params *params) { int retval = 0; diff --git a/drivers/staging/dwc2/hcd.c b/drivers/staging/dwc2/hcd.c index 772711234af7..6a594a40f7a1 100644 --- a/drivers/staging/dwc2/hcd.c +++ b/drivers/staging/dwc2/hcd.c @@ -2701,7 +2701,7 @@ EXPORT_SYMBOL_GPL(dwc2_set_all_params); * a negative error on failure. */ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq, - struct dwc2_core_params *params) + const struct dwc2_core_params *params) { struct usb_hcd *hcd; struct dwc2_host_chan *channel; diff --git a/drivers/staging/dwc2/hcd.h b/drivers/staging/dwc2/hcd.h index 88b707e4ab72..cf6c055aec8d 100644 --- a/drivers/staging/dwc2/hcd.h +++ b/drivers/staging/dwc2/hcd.h @@ -448,10 +448,10 @@ static inline u8 dwc2_hcd_is_pipe_out(struct dwc2_hcd_pipe_info *pipe) } extern int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq, - struct dwc2_core_params *params); + const struct dwc2_core_params *params); extern void dwc2_hcd_remove(struct dwc2_hsotg *hsotg); extern int dwc2_set_parameters(struct dwc2_hsotg *hsotg, - struct dwc2_core_params *params); + const struct dwc2_core_params *params); extern void dwc2_set_all_params(struct dwc2_core_params *params, int value); /* Transaction Execution Functions */ diff --git a/drivers/staging/dwc2/pci.c b/drivers/staging/dwc2/pci.c index 69c65eb8683f..12ae24b1c0ab 100644 --- a/drivers/staging/dwc2/pci.c +++ b/drivers/staging/dwc2/pci.c @@ -59,7 +59,7 @@ static const char dwc2_driver_name[] = "dwc2"; -static struct dwc2_core_params dwc2_module_params = { +static const struct dwc2_core_params dwc2_module_params = { .otg_cap = -1, .otg_ver = -1, .dma_enable = -1,