LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
	Mark Gross <markgross@kernel.org>,
	Andy Shevchenko <andy@infradead.org>,
	Wolfram Sang <wsa@the-dreams.de>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	Daniel Scally <djrscally@gmail.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>, Len Brown <lenb@kernel.org>,
	linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Kate Hsuan <hpa@redhat.com>,
	linux-media@vger.kernel.org, linux-clk@vger.kernel.org
Subject: [PATCH v6 14/15] media: ipu3-cio2: Call cio2_bridge_init() before anything else
Date: Thu, 25 Nov 2021 17:54:11 +0100	[thread overview]
Message-ID: <20211125165412.535063-15-hdegoede@redhat.com> (raw)
In-Reply-To: <20211125165412.535063-1-hdegoede@redhat.com>

Since cio2_bridge_init() may now return -EPROBE_DEFER it is best to
call it before anything else.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
index e2874fee9530..0e9b0503b62a 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1713,11 +1713,6 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
 	struct cio2_device *cio2;
 	int r;
 
-	cio2 = devm_kzalloc(dev, sizeof(*cio2), GFP_KERNEL);
-	if (!cio2)
-		return -ENOMEM;
-	cio2->pci_dev = pci_dev;
-
 	/*
 	 * On some platforms no connections to sensors are defined in firmware,
 	 * if the device has no endpoints then we can try to build those as
@@ -1735,6 +1730,11 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
 			return r;
 	}
 
+	cio2 = devm_kzalloc(dev, sizeof(*cio2), GFP_KERNEL);
+	if (!cio2)
+		return -ENOMEM;
+	cio2->pci_dev = pci_dev;
+
 	r = pcim_enable_device(pci_dev);
 	if (r) {
 		dev_err(dev, "failed to enable device (%d)\n", r);
-- 
2.33.1


  parent reply	other threads:[~2021-11-25 16:57 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-25 16:53 [PATCH v6 00/15] Add support for X86/ACPI camera sensor/PMIC setup with clk and regulator platform data Hans de Goede
2021-11-25 16:53 ` [PATCH v6 01/15] ACPI: delay enumeration of devices with a _DEP pointing to an INT3472 device Hans de Goede
2021-11-25 16:53 ` [PATCH v6 02/15] i2c: acpi: Use acpi_dev_ready_for_enumeration() helper Hans de Goede
2021-11-26  7:16   ` Mika Westerberg
2021-11-25 16:54 ` [PATCH v6 03/15] i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function Hans de Goede
2021-11-25 17:22   ` Andy Shevchenko
2021-11-26 11:19     ` Hans de Goede
2021-11-26  7:18   ` Mika Westerberg
2021-11-27 22:49   ` Wolfram Sang
2021-11-25 16:54 ` [PATCH v6 04/15] platform_data: Add linux/platform_data/tps68470.h file Hans de Goede
2021-11-25 16:54 ` [PATCH v6 05/15] regulator: Introduce tps68470-regulator driver Hans de Goede
2021-11-25 23:32   ` Laurent Pinchart
2021-11-26 11:22     ` Hans de Goede
2021-11-27 23:38       ` Laurent Pinchart
2021-11-29 12:08         ` Mark Brown
2021-11-29 15:35           ` Laurent Pinchart
2021-11-25 16:54 ` [PATCH v6 06/15] clk: Introduce clk-tps68470 driver Hans de Goede
2021-11-25 16:54 ` [PATCH v6 07/15] platform/x86: int3472: Enable I2c daisy chain Hans de Goede
2021-11-25 23:39   ` Laurent Pinchart
2021-11-26 11:30     ` Hans de Goede
2021-11-26 11:39       ` Daniel Scally
2021-11-26 11:45         ` Hans de Goede
2021-11-26 11:56           ` Daniel Scally
2021-12-03 10:21           ` Hans de Goede
2021-11-25 16:54 ` [PATCH v6 08/15] platform/x86: int3472: Split into 2 drivers Hans de Goede
2021-11-25 16:54 ` [PATCH v6 09/15] platform/x86: int3472: Add get_sensor_adev_and_name() helper Hans de Goede
2021-11-25 16:54 ` [PATCH v6 10/15] platform/x86: int3472: Pass tps68470_clk_platform_data to the tps68470-regulator MFD-cell Hans de Goede
2021-11-25 16:54 ` [PATCH v6 11/15] platform/x86: int3472: Pass tps68470_regulator_platform_data " Hans de Goede
2021-11-25 16:54 ` [PATCH v6 12/15] platform/x86: int3472: Deal with probe ordering issues Hans de Goede
2021-11-25 16:54 ` [PATCH v6 13/15] media: ipu3-cio2: Defer probing until the PMIC is fully setup Hans de Goede
2021-11-25 16:54 ` Hans de Goede [this message]
2021-11-25 16:54 ` [PATCH v6 15/15] media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs Hans de Goede

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=20211125165412.535063-15-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=andy@infradead.org \
    --cc=broonie@kernel.org \
    --cc=djrscally@gmail.com \
    --cc=hpa@redhat.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=lenb@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=markgross@kernel.org \
    --cc=mchehab@kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=mturquette@baylibre.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=sakari.ailus@linux.intel.com \
    --cc=sboyd@kernel.org \
    --cc=wsa@the-dreams.de \
    --subject='Re: [PATCH v6 14/15] media: ipu3-cio2: Call cio2_bridge_init() before anything else' \
    /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

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).