diff options
| author | Tom Rini | 2020-07-05 18:03:32 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-07-05 18:03:32 -0400 |
| commit | df3d0a3f95dd9109b889c5411204f133451b7a7e (patch) | |
| tree | 7d54c64d08db45d62e941e3697e1c691dec7ebba /drivers | |
| parent | 785195941b0746ac987a0ca501dae3e570b9f042 (diff) | |
| parent | c57383b0c22bd313c9511eeb2fd6702adbcfe030 (diff) | |
Merge branch '2020-07-01-kconfig-etc-updates' into next
- Resync Kconfiglib with the v14.1.0 release.
- Re-sync our <linux/compiler*h> files with v5.7-rc5 from upstream.
- Fully resync checkpatch.pl with v5.7 release.
To safely to all of the above, we have a few bugfixes about functions
that need a 'static inline' but weren't. We also stop setting
CROSS_COMPILE in arch/*/config.mk. Finally, with the above changes
boards can now opt-in to optimizing inlining and we do this for the
socfpga stratix10 platform for space savings.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pcie_rockchip.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pcie_rockchip.h b/drivers/pci/pcie_rockchip.h index c3a0a2846d4..845d5059e11 100644 --- a/drivers/pci/pcie_rockchip.h +++ b/drivers/pci/pcie_rockchip.h @@ -130,13 +130,12 @@ struct rockchip_pcie { int rockchip_pcie_phy_get(struct udevice *dev); -inline struct rockchip_pcie_phy *pcie_get_phy(struct rockchip_pcie *pcie) +static inline struct rockchip_pcie_phy *pcie_get_phy(struct rockchip_pcie *pcie) { return pcie->phy; } -inline -struct rockchip_pcie_phy_ops *phy_get_ops(struct rockchip_pcie_phy *phy) +static inline struct rockchip_pcie_phy_ops *phy_get_ops(struct rockchip_pcie_phy *phy) { return (struct rockchip_pcie_phy_ops *)phy->ops; } |