| Message ID | 20161207183025.20684-2-khilman@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Dec 07, 2016 at 10:30:21AM -0800, Kevin Hilman wrote: > Fix problems with automatic module loading by adding MODULE_ALIAS. Also > fix various load-time errors cause by incorrect or not present > platform_data. Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
On 07/12/16 19:30, Kevin Hilman wrote: > Fix problems with automatic module loading by adding MODULE_ALIAS. Also > fix various load-time errors cause by incorrect or not present > platform_data. > > Signed-off-by: Kevin Hilman <khilman@baylibre.com> > --- > drivers/media/platform/davinci/vpif.c | 5 ++++- > drivers/media/platform/davinci/vpif_capture.c | 15 ++++++++++++++- > drivers/media/platform/davinci/vpif_display.c | 6 ++++++ > 3 files changed, 24 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c > index 0380cf2e5775..f50148dcba64 100644 > --- a/drivers/media/platform/davinci/vpif.c > +++ b/drivers/media/platform/davinci/vpif.c > @@ -32,6 +32,9 @@ > MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver"); > MODULE_LICENSE("GPL"); > > +#define VPIF_DRIVER_NAME "vpif" > +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); > + > #define VPIF_CH0_MAX_MODES 22 > #define VPIF_CH1_MAX_MODES 2 > #define VPIF_CH2_MAX_MODES 15 > @@ -466,7 +469,7 @@ static const struct dev_pm_ops vpif_pm = { > > static struct platform_driver vpif_driver = { > .driver = { > - .name = "vpif", > + .name = VPIF_DRIVER_NAME, > .pm = vpif_pm_ops, > }, > .remove = vpif_remove, > diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c > index 5104cc0ee40e..20c4344ed118 100644 > --- a/drivers/media/platform/davinci/vpif_capture.c > +++ b/drivers/media/platform/davinci/vpif_capture.c > @@ -45,6 +45,7 @@ module_param(debug, int, 0644); > MODULE_PARM_DESC(debug, "Debug level 0-1"); > > #define VPIF_DRIVER_NAME "vpif_capture" > +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); > > /* global variables */ > static struct vpif_device vpif_obj = { {NULL} }; > @@ -647,6 +648,10 @@ static int vpif_input_to_subdev( > > vpif_dbg(2, debug, "vpif_input_to_subdev\n"); > > + if (!chan_cfg) > + return -1; > + if (input_index >= chan_cfg->input_count) > + return -1; > subdev_name = chan_cfg->inputs[input_index].subdev_name; > if (subdev_name == NULL) > return -1; > @@ -654,7 +659,7 @@ static int vpif_input_to_subdev( > /* loop through the sub device list to get the sub device info */ > for (i = 0; i < vpif_cfg->subdev_count; i++) { > subdev_info = &vpif_cfg->subdev_info[i]; > - if (!strcmp(subdev_info->name, subdev_name)) > + if (subdev_info && !strcmp(subdev_info->name, subdev_name)) Why this change? subdev_info can never be NULL. Regards, Hans > return i; > } > return -1; > @@ -685,6 +690,9 @@ static int vpif_set_input( > if (sd_index >= 0) { > sd = vpif_obj.sd[sd_index]; > subdev_info = &vpif_cfg->subdev_info[sd_index]; > + } else { > + /* no subdevice, no input to setup */ > + return 0; > } > > /* first setup input path from sub device to vpif */ > @@ -1435,6 +1443,11 @@ static __init int vpif_probe(struct platform_device *pdev) > int res_idx = 0; > int i, err; > > + if (!pdev->dev.platform_data) { > + dev_warn(&pdev->dev, "Missing platform data. Giving up.\n"); > + return -EINVAL; > + } > + > vpif_dev = &pdev->dev; > > err = initialize_vpif(); > diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c > index 75b27233ec2f..7f632b757d32 100644 > --- a/drivers/media/platform/davinci/vpif_display.c > +++ b/drivers/media/platform/davinci/vpif_display.c > @@ -42,6 +42,7 @@ module_param(debug, int, 0644); > MODULE_PARM_DESC(debug, "Debug level 0-1"); > > #define VPIF_DRIVER_NAME "vpif_display" > +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); > > /* Is set to 1 in case of SDTV formats, 2 in case of HDTV formats. */ > static int ycmux_mode; > @@ -1249,6 +1250,11 @@ static __init int vpif_probe(struct platform_device *pdev) > int res_idx = 0; > int i, err; > > + if (!pdev->dev.platform_data) { > + dev_warn(&pdev->dev, "Missing platform data. Giving up.\n"); > + return -EINVAL; > + } > + > vpif_dev = &pdev->dev; > err = initialize_vpif(); > >
Hans Verkuil <hverkuil@xs4all.nl> writes: > On 07/12/16 19:30, Kevin Hilman wrote: >> Fix problems with automatic module loading by adding MODULE_ALIAS. Also >> fix various load-time errors cause by incorrect or not present >> platform_data. >> >> Signed-off-by: Kevin Hilman <khilman@baylibre.com> >> --- >> drivers/media/platform/davinci/vpif.c | 5 ++++- >> drivers/media/platform/davinci/vpif_capture.c | 15 ++++++++++++++- >> drivers/media/platform/davinci/vpif_display.c | 6 ++++++ >> 3 files changed, 24 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c >> index 0380cf2e5775..f50148dcba64 100644 >> --- a/drivers/media/platform/davinci/vpif.c >> +++ b/drivers/media/platform/davinci/vpif.c >> @@ -32,6 +32,9 @@ >> MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver"); >> MODULE_LICENSE("GPL"); >> >> +#define VPIF_DRIVER_NAME "vpif" >> +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); >> + >> #define VPIF_CH0_MAX_MODES 22 >> #define VPIF_CH1_MAX_MODES 2 >> #define VPIF_CH2_MAX_MODES 15 >> @@ -466,7 +469,7 @@ static const struct dev_pm_ops vpif_pm = { >> >> static struct platform_driver vpif_driver = { >> .driver = { >> - .name = "vpif", >> + .name = VPIF_DRIVER_NAME, >> .pm = vpif_pm_ops, >> }, >> .remove = vpif_remove, >> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c >> index 5104cc0ee40e..20c4344ed118 100644 >> --- a/drivers/media/platform/davinci/vpif_capture.c >> +++ b/drivers/media/platform/davinci/vpif_capture.c >> @@ -45,6 +45,7 @@ module_param(debug, int, 0644); >> MODULE_PARM_DESC(debug, "Debug level 0-1"); >> >> #define VPIF_DRIVER_NAME "vpif_capture" >> +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); >> >> /* global variables */ >> static struct vpif_device vpif_obj = { {NULL} }; >> @@ -647,6 +648,10 @@ static int vpif_input_to_subdev( >> >> vpif_dbg(2, debug, "vpif_input_to_subdev\n"); >> >> + if (!chan_cfg) >> + return -1; >> + if (input_index >= chan_cfg->input_count) >> + return -1; >> subdev_name = chan_cfg->inputs[input_index].subdev_name; >> if (subdev_name == NULL) >> return -1; >> @@ -654,7 +659,7 @@ static int vpif_input_to_subdev( >> /* loop through the sub device list to get the sub device info */ >> for (i = 0; i < vpif_cfg->subdev_count; i++) { >> subdev_info = &vpif_cfg->subdev_info[i]; >> - if (!strcmp(subdev_info->name, subdev_name)) >> + if (subdev_info && !strcmp(subdev_info->name, subdev_name)) > > Why this change? subdev_info can never be NULL. A debugging leftover I guess. Will remove and resend. Thanks for the review, Kevin
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 0380cf2e5775..f50148dcba64 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -32,6 +32,9 @@ MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver"); MODULE_LICENSE("GPL"); +#define VPIF_DRIVER_NAME "vpif" +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); + #define VPIF_CH0_MAX_MODES 22 #define VPIF_CH1_MAX_MODES 2 #define VPIF_CH2_MAX_MODES 15 @@ -466,7 +469,7 @@ static const struct dev_pm_ops vpif_pm = { static struct platform_driver vpif_driver = { .driver = { - .name = "vpif", + .name = VPIF_DRIVER_NAME, .pm = vpif_pm_ops, }, .remove = vpif_remove, diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 5104cc0ee40e..20c4344ed118 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -45,6 +45,7 @@ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Debug level 0-1"); #define VPIF_DRIVER_NAME "vpif_capture" +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); /* global variables */ static struct vpif_device vpif_obj = { {NULL} }; @@ -647,6 +648,10 @@ static int vpif_input_to_subdev( vpif_dbg(2, debug, "vpif_input_to_subdev\n"); + if (!chan_cfg) + return -1; + if (input_index >= chan_cfg->input_count) + return -1; subdev_name = chan_cfg->inputs[input_index].subdev_name; if (subdev_name == NULL) return -1; @@ -654,7 +659,7 @@ static int vpif_input_to_subdev( /* loop through the sub device list to get the sub device info */ for (i = 0; i < vpif_cfg->subdev_count; i++) { subdev_info = &vpif_cfg->subdev_info[i]; - if (!strcmp(subdev_info->name, subdev_name)) + if (subdev_info && !strcmp(subdev_info->name, subdev_name)) return i; } return -1; @@ -685,6 +690,9 @@ static int vpif_set_input( if (sd_index >= 0) { sd = vpif_obj.sd[sd_index]; subdev_info = &vpif_cfg->subdev_info[sd_index]; + } else { + /* no subdevice, no input to setup */ + return 0; } /* first setup input path from sub device to vpif */ @@ -1435,6 +1443,11 @@ static __init int vpif_probe(struct platform_device *pdev) int res_idx = 0; int i, err; + if (!pdev->dev.platform_data) { + dev_warn(&pdev->dev, "Missing platform data. Giving up.\n"); + return -EINVAL; + } + vpif_dev = &pdev->dev; err = initialize_vpif(); diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index 75b27233ec2f..7f632b757d32 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -42,6 +42,7 @@ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Debug level 0-1"); #define VPIF_DRIVER_NAME "vpif_display" +MODULE_ALIAS("platform:" VPIF_DRIVER_NAME); /* Is set to 1 in case of SDTV formats, 2 in case of HDTV formats. */ static int ycmux_mode; @@ -1249,6 +1250,11 @@ static __init int vpif_probe(struct platform_device *pdev) int res_idx = 0; int i, err; + if (!pdev->dev.platform_data) { + dev_warn(&pdev->dev, "Missing platform data. Giving up.\n"); + return -EINVAL; + } + vpif_dev = &pdev->dev; err = initialize_vpif();
Fix problems with automatic module loading by adding MODULE_ALIAS. Also fix various load-time errors cause by incorrect or not present platform_data. Signed-off-by: Kevin Hilman <khilman@baylibre.com> --- drivers/media/platform/davinci/vpif.c | 5 ++++- drivers/media/platform/davinci/vpif_capture.c | 15 ++++++++++++++- drivers/media/platform/davinci/vpif_display.c | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-)