diff options
| -rw-r--r-- | configs/kylin-rk3036_defconfig.rej | 10 | ||||
| -rw-r--r-- | configs/puma-rk3399_defconfig.rej | 10 | ||||
| -rw-r--r-- | drivers/pci/pci-uclass.c | 3 |
3 files changed, 0 insertions, 23 deletions
diff --git a/configs/kylin-rk3036_defconfig.rej b/configs/kylin-rk3036_defconfig.rej deleted file mode 100644 index 5478e65f1ab..00000000000 --- a/configs/kylin-rk3036_defconfig.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- configs/kylin-rk3036_defconfig -+++ configs/kylin-rk3036_defconfig -@@ -8,6 +8,7 @@ CONFIG_ROCKCHIP_RK3036=y - CONFIG_TARGET_KYLIN_RK3036=y - CONFIG_SPL_STACK_R_ADDR=0x80000 - CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" -+CONFIG_DEBUG_UART=y - CONFIG_SPL_SYS_MALLOC_F_LEN=0x0 - # CONFIG_ANDROID_BOOT_IMAGE is not set - # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/puma-rk3399_defconfig.rej b/configs/puma-rk3399_defconfig.rej deleted file mode 100644 index 78a1819b5fa..00000000000 --- a/configs/puma-rk3399_defconfig.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- configs/puma-rk3399_defconfig -+++ configs/puma-rk3399_defconfig -@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y - CONFIG_GMAC_ROCKCHIP=y - CONFIG_PINCTRL=y - CONFIG_SPL_PINCTRL=y --CONFIG_PINCTRL_ROCKCHIP_RK3399=y - CONFIG_DM_PMIC=y - CONFIG_DM_PMIC_FAN53555=y - CONFIG_PMIC_RK8XX=y diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 47f3cc9107d..824fa119074 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1026,7 +1026,6 @@ int pci_get_devfn(struct udevice *dev) static int pci_uclass_child_post_bind(struct udevice *dev) { struct pci_child_platdata *pplat; - int ret; if (!dev_of_valid(dev)) return 0; @@ -1038,8 +1037,6 @@ static int pci_uclass_child_post_bind(struct udevice *dev) /* Extract the devfn from fdt_pci_addr */ pplat->devfn = pci_get_devfn(dev); - if (ret < 0) - return ret; return 0; } |