Commit 9ccd9ef3 authored Dec 09, 2020 by Arnd Bergmann

Merge tag 'v5.11-rockchip-drivers-1' of...

Merge tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/drivers

Minor fixes for the io-domain soc-driver

* tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: io-domain: Fix error return code in rockchip_iodomain_probe()
  soc: rockchip: io-domain: Remove incorrect and incomplete comment header

Link: https://lore.kernel.org/r/2045618.irdbgypaU6@phil


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 5dd65cf7 c2867b2e

drivers/soc/rockchip/io-domain.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -53,9 +53,6 @@

		struct rockchip_iodomain;

		/**
		* @supplies: voltage settings matching the register bits.
		*/
		struct rockchip_iodomain_soc_data {
		int grf_offset;
		const char *supply_names[MAX_SUPPLIES];
		@@ -547,6 +544,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev)
		if (uV < 0) {
		dev_err(iod->dev, "Can't determine voltage: %s\n",
		supply_name);
		ret = uV;
		goto unreg_notify;
		}

Admin message