ptp: ocp: minor updates and fixes.
v2 cover ptp: ocp: minor updates and fixes.
Fix errors spotted by automated tools.
Add myself to the MAINTAINERS for the ptp_ocp driver. --
v2: Add Fixes tags, fix NET_DEVLINK
Jonathan Lemon (4):
ptp: ocp: Fix uninitialized variable warning spotted by clang.
ptp: ocp: Fix error path for pci_ocp_device_init()
ptp: ocp: Have Kconfig select NET_DEVLINK
MAINTAINERS: Update for ptp_ocp driver.
MAINTAINERS | 6 ++++++ drivers/ptp/Kconfig | 1 + drivers/ptp/ptp_ocp.c | 9 +++++---- 3 files changed, 12 insertions(+), 4 deletions(-)
Signature · 1 line
2.31.1
PATCH v2 1/4 ptp: ocp: Fix uninitialized variable warning spotted by clang.
If attempting to flash the firmware with a blob of size 0, the entire write loop is skipped and the uninitialized err is returned. Fix by setting to 0 first.
timecard.")
--- drivers/ptp/ptp_ocp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ptp/ptp_ocp.c +1 -1
@@ -763,7 +763,7 @@ ptp_ocp_devlink_flash(struct devlink *devlink, struct device *dev,size_t off, len, resid, wrote;struct erase_info erase;size_t base, blksz; -int err; +int err =0 ; off =0 ; base = bp->flash_start;
Signature · 1 line
2.31.1
PATCH v2 2/4 ptp: ocp: Fix error path for pci_ocp_device_init()
In reply to Jonathan LemonIf ptp_ocp_device_init() fails, pci_disable_device() is skipped. Fix the error handling so this case is covered. Update ptp_ocp_remove() so the normal exit path is identical.
timecard.")
--- drivers/ptp/ptp_ocp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/ptp/ptp_ocp.c +4 -3
@@ -1438,7 +1438,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) bp =devlink_priv (devlink); err =ptp_ocp_device_init (bp, pdev);if (err) - goto out_unregister; + goto out_disable;/* compat mode. * Older FPGA firmware only returns 2 irq's.
@@ -1476,8 +1476,9 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id) out:ptp_ocp_detach (bp); -pci_disable_device (pdev);pci_set_drvdata (pdev,NULL ); +out_disable: +pci_disable_device (pdev); out_unregister:devlink_unregister (devlink); out_free:
@@ -1493,8 +1494,8 @@ ptp_ocp_remove(struct pci_dev *pdev)struct devlink *devlink =priv_to_devlink (bp);ptp_ocp_detach (bp); -pci_disable_device (pdev);pci_set_drvdata (pdev,NULL ); +pci_disable_device (pdev);devlink_unregister (devlink);devlink_free (devlink);
Signature · 1 line
2.31.1
PATCH v2 3/4 ptp: ocp: Have Kconfig select NET_DEVLINK
In reply to Jonathan LemonNET doesn't imply NET_DEVLINK. Select this separately, so that random config combinations don't complain.
timecard.")
--- drivers/ptp/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/ptp/Kconfig +1 -0
@@ -177,6 +177,7 @@ config PTP_1588_CLOCK_OCP imply MTD_SPI_NOR imply I2C_XILINX select SERIAL_8250 + select NET_DEVLINK default n help
Signature · 1 line
2.31.1
PATCH v2 4/4 MAINTAINERS: Update for ptp_ocp driver.
In reply to Jonathan LemonAdd maintainer info for the OpenCompute PTP driver.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -13885,6 +13885,12 @@ F: Documentation/devicetree/ F: arch/*/boot/dts/ F: include/dt-bindings/ +OPENCOMPUTE PTP CLOCK DRIVER +M: Jonathan Lemon <[email protected]> +L: [email protected] +S: Maintained +F: drivers/ptp/ptp_ocp.c + OPENCORES I2C BUS DRIVER M: Peter Korsgaard <[email protected]> M: Andrew Lunn <[email protected]>
Signature · 1 line
2.31.1
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 6 lines · On Mon, 16 Aug 2021 15:13:33 -0700 you wrote:
Fix errors spotted by automated tools.
Add myself to the
MAINTAINERSfor theptp_ocpdriver. --
v2: Add Fixes tags, fixNET_DEVLINK
Quoted 7 lines
Jonathan Lemon (4):
ptp: ocp: Fix uninitialized variable warning spotted by clang.
ptp: ocp: Fix error path forpci_ocp_device_init()
ptp: ocp: HaveKconfigselectNET_DEVLINK
MAINTAINERS: Update forptp_ocpdriver.[...]
Here is the summary with links:
- [net-next,v2,1/4] ptp: ocp: Fix uninitialized variable warning spotted by clang.
https://git.kernel.org/netdev/net-next/c/7c8075728f4d - [net-next,v2,2/4] ptp: ocp: Fix error path for pci_ocp_device_init() https://git.kernel.org/netdev/net-next/c/d9fdbf132dab - [net-next,v2,3/4] ptp: ocp: Have Kconfig select NET_DEVLINK https://git.kernel.org/netdev/net-next/c/d79500e66a52 - [net-next,v2,4/4] MAINTAINERS: Update for ptp_ocp driver. https://git.kernel.org/netdev/net-next/c/b40fb16df9f4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html