diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2012-03-08 11:02:50 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-10 08:05:51 -0500 |
| commit | fda95c2e7304c9d4d7ed8f2590346acbbfff2f99 (patch) | |
| tree | b3cd29d2c41a772d13e5566cc0e9d0b44eafc380 | |
| parent | 6aa1ead1b855819b8b754d0f84f9da6942fe7589 (diff) | |
gma500: mdfld_dsi_output_init() drop unused parameter
Nobody uses 'config' parameter.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/gma500/mdfld_dsi_output.c | 18 | ||||
| -rw-r--r-- | drivers/gpu/drm/gma500/mdfld_dsi_output.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/gma500/mdfld_output.c | 9 |
3 files changed, 9 insertions, 19 deletions
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c index 9338c28f3999..88d330d95f2c 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c +++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c | |||
| @@ -511,7 +511,6 @@ gpio_error: | |||
| 511 | */ | 511 | */ |
| 512 | void mdfld_dsi_output_init(struct drm_device *dev, | 512 | void mdfld_dsi_output_init(struct drm_device *dev, |
| 513 | int pipe, | 513 | int pipe, |
| 514 | struct mdfld_dsi_config *config, | ||
| 515 | const struct panel_funcs *p_vid_funcs) | 514 | const struct panel_funcs *p_vid_funcs) |
| 516 | { | 515 | { |
| 517 | struct mdfld_dsi_config *dsi_config; | 516 | struct mdfld_dsi_config *dsi_config; |
| @@ -538,18 +537,13 @@ void mdfld_dsi_output_init(struct drm_device *dev, | |||
| 538 | 537 | ||
| 539 | dsi_connector->pipe = pipe; | 538 | dsi_connector->pipe = pipe; |
| 540 | 539 | ||
| 541 | /*set DSI config*/ | 540 | dsi_config = kzalloc(sizeof(struct mdfld_dsi_config), |
| 542 | if (config) | 541 | GFP_KERNEL); |
| 543 | dsi_config = config; | 542 | if (!dsi_config) { |
| 544 | else { | 543 | DRM_ERROR("cannot allocate memory for DSI config\n"); |
| 545 | dsi_config = kzalloc(sizeof(struct mdfld_dsi_config), | 544 | goto dsi_init_err0; |
| 546 | GFP_KERNEL); | ||
| 547 | if (!dsi_config) { | ||
| 548 | DRM_ERROR("cannot allocate memory for DSI config\n"); | ||
| 549 | goto dsi_init_err0; | ||
| 550 | } | ||
| 551 | mdfld_dsi_get_default_config(dev, dsi_config, pipe); | ||
| 552 | } | 545 | } |
| 546 | mdfld_dsi_get_default_config(dev, dsi_config, pipe); | ||
| 553 | 547 | ||
| 554 | dsi_connector->private = dsi_config; | 548 | dsi_connector->private = dsi_config; |
| 555 | 549 | ||
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h index 2cdf666536df..8e4f717e50f2 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h +++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.h | |||
| @@ -375,7 +375,6 @@ extern void mdfld_dsi_brightness_control(struct drm_device *dev, int pipe, | |||
| 375 | int level); | 375 | int level); |
| 376 | extern void mdfld_dsi_output_init(struct drm_device *dev, | 376 | extern void mdfld_dsi_output_init(struct drm_device *dev, |
| 377 | int pipe, | 377 | int pipe, |
| 378 | struct mdfld_dsi_config *config, | ||
| 379 | const struct panel_funcs *p_vid_funcs); | 378 | const struct panel_funcs *p_vid_funcs); |
| 380 | extern void mdfld_dsi_controller_init(struct mdfld_dsi_config *dsi_config, | 379 | extern void mdfld_dsi_controller_init(struct mdfld_dsi_config *dsi_config, |
| 381 | int pipe); | 380 | int pipe); |
diff --git a/drivers/gpu/drm/gma500/mdfld_output.c b/drivers/gpu/drm/gma500/mdfld_output.c index de0ce0765738..c95966bb0c96 100644 --- a/drivers/gpu/drm/gma500/mdfld_output.c +++ b/drivers/gpu/drm/gma500/mdfld_output.c | |||
| @@ -42,17 +42,14 @@ static void mdfld_init_panel(struct drm_device *dev, int mipi_pipe, | |||
| 42 | { | 42 | { |
| 43 | switch (p_type) { | 43 | switch (p_type) { |
| 44 | case TPO_VID: | 44 | case TPO_VID: |
| 45 | mdfld_dsi_output_init(dev, mipi_pipe, NULL, | 45 | mdfld_dsi_output_init(dev, mipi_pipe, &mdfld_tpo_vid_funcs); |
| 46 | &mdfld_tpo_vid_funcs); | ||
| 47 | break; | 46 | break; |
| 48 | case TC35876X: | 47 | case TC35876X: |
| 49 | tc35876x_init(dev); | 48 | tc35876x_init(dev); |
| 50 | mdfld_dsi_output_init(dev, mipi_pipe, NULL, | 49 | mdfld_dsi_output_init(dev, mipi_pipe, &mdfld_tc35876x_funcs); |
| 51 | &mdfld_tc35876x_funcs); | ||
| 52 | break; | 50 | break; |
| 53 | case TMD_VID: | 51 | case TMD_VID: |
| 54 | mdfld_dsi_output_init(dev, mipi_pipe, NULL, | 52 | mdfld_dsi_output_init(dev, mipi_pipe, &mdfld_tmd_vid_funcs); |
| 55 | &mdfld_tmd_vid_funcs); | ||
| 56 | break; | 53 | break; |
| 57 | case HDMI: | 54 | case HDMI: |
| 58 | /* if (dev_priv->mdfld_hdmi_present) | 55 | /* if (dev_priv->mdfld_hdmi_present) |