Skip to content

Commit

Permalink
Merge tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Arnd Bergmann committed Dec 8, 2020
2 parents 5dd65cf + c2867b2 commit 9ccd9ef
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/soc/rockchip/io-domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 9ccd9ef

Please sign in to comment.