From: Hans Verkuil <hverkuil@xs4all.nl>
To: Kevin Hilman <khilman@baylibre.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sakari Ailus <sakari.ailus@iki.fi>,
linux-media@vger.kernel.org
Cc: "Sekhar Nori" <nsekhar@ti.com>,
"Axel Haslam" <ahaslam@baylibre.com>,
"Bartosz Gołaszewski" <bgolaszewski@baylibre.com>,
"Alexandre Bailon" <abailon@baylibre.com>,
"David Lechner" <david@lechnology.com>,
"Patrick Titiano" <ptitiano@baylibre.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v6 1/5] [media] davinci: VPIF: fix module loading, init errors
Date: Fri, 16 Dec 2016 10:44:20 +0100 [thread overview]
Message-ID: <19dc6321-1433-e089-f753-e5f736e26073@xs4all.nl> (raw)
In-Reply-To: <20161207183025.20684-2-khilman@baylibre.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();
>
>
next prev parent reply other threads:[~2016-12-16 9:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 18:30 [PATCH v6 0/5] davinci: VPIF: add DT support Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 1/5] [media] davinci: VPIF: fix module loading, init errors Kevin Hilman
2016-12-09 10:07 ` Sakari Ailus
2016-12-16 9:44 ` Hans Verkuil [this message]
2016-12-16 23:39 ` Kevin Hilman
2016-12-17 0:47 ` [PATCH v6.1 " Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 2/5] [media] davinci: vpif_capture: remove hard-coded I2C adapter id Kevin Hilman
2016-12-09 10:20 ` Sakari Ailus
2016-12-07 18:30 ` [PATCH v6 3/5] [media] davinci: vpif_capture: fix start/stop streaming locking Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 4/5] [media] dt-bindings: add TI VPIF documentation Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 5/5] [media] davinci: VPIF: add basic support for DT init Kevin Hilman
2016-12-07 20:03 ` [PATCH v6 0/5] davinci: VPIF: add DT support Javier Martinez Canillas
2016-12-09 0:25 ` Kevin Hilman
2016-12-16 9:47 ` Hans Verkuil
2016-12-17 0:49 ` Kevin Hilman
2017-01-27 17:22 ` Kevin Hilman
2017-01-30 9:33 ` Hans Verkuil
2017-01-03 9:03 ` Sekhar Nori
2017-01-03 9:12 ` Laurent Pinchart
2017-01-04 11:32 ` Sekhar Nori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19dc6321-1433-e089-f753-e5f736e26073@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=abailon@baylibre.com \
--cc=ahaslam@baylibre.com \
--cc=bgolaszewski@baylibre.com \
--cc=david@lechnology.com \
--cc=khilman@baylibre.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=ptitiano@baylibre.com \
--cc=sakari.ailus@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).