UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2020-12-09 00:27:44 +01:00
parent 5dd65cf78d c2867b2e71
commit 9ccd9ef36f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/soc/rockchip/io-domain.c
View File

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