From patchwork Sat Dec 17 00:47:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 38739 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cI3AW-0008JO-EY; Sat, 17 Dec 2016 00:48:08 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cI3AT-0001fw-2z; Sat, 17 Dec 2016 01:48:08 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933120AbcLQAr7 (ORCPT + 1 other); Fri, 16 Dec 2016 19:47:59 -0500 Received: from mail-pg0-f42.google.com ([74.125.83.42]:35665 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932942AbcLQAr5 (ORCPT ); Fri, 16 Dec 2016 19:47:57 -0500 Received: by mail-pg0-f42.google.com with SMTP id p66so37603155pga.2 for ; Fri, 16 Dec 2016 16:47:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hex654IPPmQi/TOQ+uLCAqLzr+fZC1SbrYQ+LItVeV0=; b=FtmaZeqOMHIc+PA32n/XOqPJ+DytXFvBvOoHlFIC/GQpKEgcujDwxvxPUCscCmbwaV haCMX5LDnrM41VCYDiRHlyLwiBaD9ZaPdyA9RGpfUHw5bVpQsHuc2SEHEcV+LFD94a0D Zus5sxgyAojbfvJ95+l/jQ+GWpPvHGvso1OYkx0MWhmu+ofENfhK3QMYiRJwJ0YWfKwl 7Sg9B8TNZfjxuXWzwW9UjIgkGM7nwOm4D1sxgkdPl6PvUqm3QM8BbOSgdaqlnyALLWfX qbk1CveBn+jTztfKB8JTAUwYQQTa8JmE9yrJ0YtVxspJCeENd/HyNS+TGcVzujaKuh/1 x8mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hex654IPPmQi/TOQ+uLCAqLzr+fZC1SbrYQ+LItVeV0=; b=I4kQ/+rBuc7peZPYtoOnCaEJe87fuQzQsE1Yb6vXYgtFdJh2uAdwCfs34rTCtsLcvx RgMQBziAM0IRNWxNKoqMGGUsCF2dhsm8+Am2+6ofquqTCQlk/lB+s7LNp+IPaJ0YDDyt jYN+u/oc42jnRYc7VtZI7S7SmgxkwCisG34HMkQWHpzfiOcuoomGAyMizEs5aYB+8H6c lMtHLrJRMeUcmtT2V7C/9ueiL+M5D5BzqfcogOqk0NOJYYoH4FRSX0CG4lcr3FRLPZyj YYb6HJgA/FfMi94mf4FfT/ye1jQUVDri8EztsIf5Cwhoz2/KXdqG9SDrOgjBorsiQ5fW 49AA== X-Gm-Message-State: AKaTC03C8H36XnL4i9AwEgUuuiFPqFzLnvFkbY83goXCrkya1CPDPs5jhUFKaHiYE4aqao3s X-Received: by 10.84.173.195 with SMTP id p61mr12531466plb.158.1481935676401; Fri, 16 Dec 2016 16:47:56 -0800 (PST) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id y200sm14357994pfb.16.2016.12.16.16.47.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Dec 2016 16:47:55 -0800 (PST) From: Kevin Hilman To: Hans Verkuil , Laurent Pinchart , Sakari Ailus Cc: linux-media@vger.kernel.org, Sekhar Nori , linux-arm-kernel@lists.infradead.org Subject: [PATCH v6.1 1/5] [media] davinci: VPIF: fix module loading, init errors Date: Fri, 16 Dec 2016 16:47:54 -0800 Message-Id: <20161217004754.10241-1-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161207183025.20684-2-khilman@baylibre.com> References: <20161207183025.20684-2-khilman@baylibre.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.12.17.4219 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CTE 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' 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 Signed-off-by: Kevin Hilman --- Minor tweaks since v6 - added ack from Sakari - droped an extraneous change for NULL subdev_info drivers/media/platform/davinci/vpif.c | 5 ++++- drivers/media/platform/davinci/vpif_capture.c | 13 +++++++++++++ drivers/media/platform/davinci/vpif_display.c | 6 ++++++ 3 files changed, 23 insertions(+), 1 deletion(-) 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..892a26f3c5b4 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; @@ -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();