From f19f8da1df280361f5e626c9c6e1e4d4d4aa5514 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@kernel.org>
Date: Sun, 25 Feb 2024 09:31:25 +0000
Subject: [PATCH] tetragon: Remove MapBuilderPin function

It's no longer needed.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 pkg/sensors/load.go        |  8 ++++----
 pkg/sensors/program/map.go | 15 +++++----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkg/sensors/load.go b/pkg/sensors/load.go
index 3d38c972921..04915d4ddd8 100644
--- a/pkg/sensors/load.go
+++ b/pkg/sensors/load.go
@@ -219,13 +219,13 @@ func (s *Sensor) FindPrograms() error {
 func (s *Sensor) SetMapPinPath(m *program.Map) {
 	switch m.Type {
 	case program.MapTypeGlobal:
-		m.PinPath = filepath.Join(m.PinName)
+		m.PinPath = filepath.Join(m.Name)
 	case program.MapTypePolicy:
-		m.PinPath = filepath.Join(s.Policy, m.PinName)
+		m.PinPath = filepath.Join(s.Policy, m.Name)
 	case program.MapTypeSensor:
-		m.PinPath = filepath.Join(s.Policy, s.Name, m.PinName)
+		m.PinPath = filepath.Join(s.Policy, s.Name, m.Name)
 	case program.MapTypeProgram:
-		m.PinPath = filepath.Join(s.Policy, s.Name, m.Prog.PinName, m.PinName)
+		m.PinPath = filepath.Join(s.Policy, s.Name, m.Prog.PinName, m.Name)
 	}
 }
 
diff --git a/pkg/sensors/program/map.go b/pkg/sensors/program/map.go
index 1d7b6693ac4..13048174d06 100644
--- a/pkg/sensors/program/map.go
+++ b/pkg/sensors/program/map.go
@@ -25,7 +25,6 @@ const (
 // Map represents BPF maps.
 type Map struct {
 	Name      string
-	PinName   string
 	PinPath   string
 	Prog      *Program
 	PinState  State
@@ -33,26 +32,22 @@ type Map struct {
 	Type      MapType
 }
 
-func mapBuilder(name, pin string, ld *Program, ty MapType) *Map {
-	m := &Map{name, pin, "", ld, Idle(), nil, ty}
+func mapBuilder(name string, ld *Program, ty MapType) *Map {
+	m := &Map{name, "", ld, Idle(), nil, ty}
 	ld.PinMap[name] = m
 	return m
 }
 
 func MapBuilder(name string, ld *Program) *Map {
-	return mapBuilder(name, name, ld, MapTypeGlobal)
+	return mapBuilder(name, ld, MapTypeGlobal)
 }
 
 func MapBuilderType(name string, ld *Program, ty MapType) *Map {
-	return mapBuilder(name, name, ld, ty)
-}
-
-func MapBuilderPin(name, pin string, ld *Program) *Map {
-	return mapBuilder(name, pin, ld, MapTypeGlobal)
+	return mapBuilder(name, ld, ty)
 }
 
 func (m *Map) Unload() error {
-	log := logger.GetLogger().WithField("map", m.Name).WithField("pin", m.PinName)
+	log := logger.GetLogger().WithField("map", m.Name).WithField("pin", m.Name)
 	if !m.PinState.IsLoaded() {
 		log.WithField("count", m.PinState.count).Debug("Refusing to unload map as it is not loaded")
 		return nil