github/intel-device-plugins-for-kubernetes
7
0
Fork 0
mirror of https://github.com/intel/intel-device-plugins-for-kubernetes.git synced 2025-06-03 03:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fpga: fix naked return error from linter

Browse Source 
golangci-lint version < v1.53.0 used nakedret linter that did not check
return values in conditionals. That got changed in v1.53.0 and some
of our code starts failing because of naked returns from conditionals.

Update the code to get nakedret linter passing.

Signed-off-by: Hyeongju Johannes Lee <hyeongju.lee@intel.com>
This commit is contained in:
Hyeongju Johannes Lee 2023-07-18 23:48:41 +03:00
parent 033783459f
commit c60a3afb26
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/fpga_tool/fpga_tool.go
View File

@ -118,7 +118,7 @@ func validateFlags(cmd, bitstream, device string, port uint) error {
func installBitstream(fname string, dryRun, force, quiet bool) (err error) { func installBitstream(fname string, dryRun, force, quiet bool) (err error) {
info, err := bitstream.Open(fname) info, err := bitstream.Open(fname)
if err != nil { if err != nil {
return return err
} }
defer info.Close() defer info.Close()
@ -129,7 +129,7 @@ func installBitstream(fname string, dryRun, force, quiet bool) (err error) {
if dryRun { if dryRun {
fmt.Println("Dry-run: no copying performed") fmt.Println("Dry-run: no copying performed")
return return nil
} }
} }
@ -285,21 +285,21 @@ func printFpgaPort(f fpga.Port, quiet bool) (err error) {
pci, err := f.GetPCIDevice() pci, err := f.GetPCIDevice()
if err != nil { if err != nil {
return return err
} }
printPCIeInfo(pci, quiet) printPCIeInfo(pci, quiet)
fme, err := f.GetFME() fme, err := f.GetFME()
if err != nil { if err != nil {
return return err
} }
fmt.Printf("FME Name : %s\n", fme.GetName()) fmt.Printf("FME Name : %s\n", fme.GetName())
num, err := f.GetPortID() num, err := f.GetPortID()
if err != nil { if err != nil {
return return err
} }
fmt.Printf("Port Id : %d\n", num) fmt.Printf("Port Id : %d\n", num)

8
pkg/fpga/dfl_linux.go
View File

@ -403,7 +403,7 @@ func (f *DflPort) GetFME() (fme FME, err error) {
pci, err := f.GetPCIDevice() pci, err := f.GetPCIDevice()
if err != nil { if err != nil {
return return nil, err
} }
if pci.PhysFn != nil { if pci.PhysFn != nil {
@ -417,17 +417,17 @@ func (f *DflPort) GetFME() (fme FME, err error) {
} }
if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, dflFpgaFmeGlobPCI)); err != nil { if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, dflFpgaFmeGlobPCI)); err != nil {
return return nil, err
} }
realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev)) realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev))
if err != nil { if err != nil {
return return nil, err
} }
fme, err = NewDflFME(realDev) fme, err = NewDflFME(realDev)
if err != nil { if err != nil {
return return nil, err
} }
f.FME = fme f.FME = fme

8
pkg/fpga/intel_fpga_linux.go
View File

@ -408,7 +408,7 @@ func (f *IntelFpgaPort) GetFME() (fme FME, err error) {
pci, err := f.GetPCIDevice() pci, err := f.GetPCIDevice()
if err != nil { if err != nil {
return return nil, err
} }
if pci.PhysFn != nil { if pci.PhysFn != nil {
@ -421,17 +421,17 @@ func (f *IntelFpgaPort) GetFME() (fme FME, err error) {
"dev": &dev, "dev": &dev,
} }
if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, intelFpgaFmeGlobPCI)); err != nil { if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, intelFpgaFmeGlobPCI)); err != nil {
return return nil, err
} }
realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev)) realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev))
if err != nil { if err != nil {
return return nil, err
} }
fme, err = NewIntelFpgaFME(realDev) fme, err = NewIntelFpgaFME(realDev)
if err != nil { if err != nil {
return return nil, err
} }
f.FME = fme f.FME = fme