Skip to contentSkip to conversation

ACPI: Delete unused proc filename macros

PATCH Applied Pascal Terjan 2 participants 2 messages May 10, 2020 – May 14, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: Delete unused proc filename macros

Those were used to create files in /proc/acpi long ago and were missed when that code was deleted.

---
 drivers/acpi/button.c   | 1 -
 drivers/acpi/ec.c       | 1 -
 drivers/acpi/pci_link.c | 2 --
 drivers/acpi/power.c    | 2 --
 drivers/acpi/sbs.c      | 3 ---
 5 files changed, 9 deletions(-)
drivers/acpi/button.c +0 -1
index 78cfc70cb320..3c35e57dd854 100644
@@ -24,7 +24,6 @@
 #define PREFIX "ACPI: "
 
 #define ACPI_BUTTON_CLASS		"button"
-#define ACPI_BUTTON_FILE_INFO		"info"
 #define ACPI_BUTTON_FILE_STATE		"state"
 #define ACPI_BUTTON_TYPE_UNKNOWN	0x00
 #define ACPI_BUTTON_NOTIFY_STATUS	0x80
drivers/acpi/ec.c +0 -1
index b4c0152e92aa..8535bea2f4e3 100644
@@ -34,7 +34,6 @@
 
 #define ACPI_EC_CLASS			"embedded_controller"
 #define ACPI_EC_DEVICE_NAME		"Embedded Controller"
-#define ACPI_EC_FILE_INFO		"info"
 
 /* EC status register */
 #define ACPI_EC_FLAG_OBF	0x01	/* Output buffer full */
drivers/acpi/pci_link.c +0 -2
index ed3d2182cf2c..606da5d77ad3 100644
@@ -31,8 +31,6 @@
 ACPI_MODULE_NAME("pci_link");
 #define ACPI_PCI_LINK_CLASS		"pci_irq_routing"
 #define ACPI_PCI_LINK_DEVICE_NAME	"PCI Interrupt Link"
-#define ACPI_PCI_LINK_FILE_INFO		"info"
-#define ACPI_PCI_LINK_FILE_STATUS	"state"
 #define ACPI_PCI_LINK_MAX_POSSIBLE	16
 
 static int acpi_pci_link_add(struct acpi_device *device,
drivers/acpi/power.c +0 -2
index fe1e7bc91a5e..837b875d075e 100644
@@ -36,8 +36,6 @@
 ACPI_MODULE_NAME("power");
 #define ACPI_POWER_CLASS		"power_resource"
 #define ACPI_POWER_DEVICE_NAME		"Power Resource"
-#define ACPI_POWER_FILE_INFO		"info"
-#define ACPI_POWER_FILE_STATUS		"state"
 #define ACPI_POWER_RESOURCE_STATE_OFF	0x00
 #define ACPI_POWER_RESOURCE_STATE_ON	0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
drivers/acpi/sbs.c +0 -3
index 6e88224f60f0..f158b8c30113 100644
@@ -28,9 +28,6 @@
 #define ACPI_SBS_CLASS			"sbs"
 #define ACPI_AC_CLASS			"ac_adapter"
 #define ACPI_SBS_DEVICE_NAME		"Smart Battery System"
-#define ACPI_SBS_FILE_INFO		"info"
-#define ACPI_SBS_FILE_STATE		"state"
-#define ACPI_SBS_FILE_ALARM		"alarm"
 #define ACPI_BATTERY_DIR_NAME		"BAT%i"
 #define ACPI_AC_DIR_NAME		"AC0"
 
Signature · 1 line
2.26.2.645.ge9eca65c58-goog
maintainer Applied
#1 lore raw
Quoted 68 lines · Pascal Terjan

Those were used to create files in /proc/acpi long ago and were missed when that code was deleted.

---
 drivers/acpi/button.c   | 1 -
 drivers/acpi/ec.c       | 1 -
 drivers/acpi/pci_link.c | 2 --
 drivers/acpi/power.c    | 2 --
 drivers/acpi/sbs.c      | 3 ---
 5 files changed, 9 deletions(-)
drivers/acpi/button.c +0 -1
index 78cfc70cb320..3c35e57dd854 100644
@@ -24,7 +24,6 @@
 #define PREFIX "ACPI: "
 
 #define ACPI_BUTTON_CLASS              "button"
-#define ACPI_BUTTON_FILE_INFO          "info"
 #define ACPI_BUTTON_FILE_STATE         "state"
 #define ACPI_BUTTON_TYPE_UNKNOWN       0x00
 #define ACPI_BUTTON_NOTIFY_STATUS      0x80
drivers/acpi/ec.c +0 -1
index b4c0152e92aa..8535bea2f4e3 100644
@@ -34,7 +34,6 @@
 
 #define ACPI_EC_CLASS                  "embedded_controller"
 #define ACPI_EC_DEVICE_NAME            "Embedded Controller"
-#define ACPI_EC_FILE_INFO              "info"
 
 /* EC status register */
 #define ACPI_EC_FLAG_OBF       0x01    /* Output buffer full */
drivers/acpi/pci_link.c +0 -2
index ed3d2182cf2c..606da5d77ad3 100644
@@ -31,8 +31,6 @@
 ACPI_MODULE_NAME("pci_link");
 #define ACPI_PCI_LINK_CLASS            "pci_irq_routing"
 #define ACPI_PCI_LINK_DEVICE_NAME      "PCI Interrupt Link"
-#define ACPI_PCI_LINK_FILE_INFO                "info"
-#define ACPI_PCI_LINK_FILE_STATUS      "state"
 #define ACPI_PCI_LINK_MAX_POSSIBLE     16
 
 static int acpi_pci_link_add(struct acpi_device *device,
drivers/acpi/power.c +0 -2
index fe1e7bc91a5e..837b875d075e 100644
@@ -36,8 +36,6 @@
 ACPI_MODULE_NAME("power");
 #define ACPI_POWER_CLASS               "power_resource"
 #define ACPI_POWER_DEVICE_NAME         "Power Resource"
-#define ACPI_POWER_FILE_INFO           "info"
-#define ACPI_POWER_FILE_STATUS         "state"
 #define ACPI_POWER_RESOURCE_STATE_OFF  0x00
 #define ACPI_POWER_RESOURCE_STATE_ON   0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
drivers/acpi/sbs.c +0 -0
index 6e88224f60f0..f158b8c30113 100644

drivers/acpi/sbs.c

Quoted 10 lines
drivers/acpi/sbs.c +0 -4
@@ -28,9 +28,6 @@
 #define ACPI_SBS_CLASS                 "sbs"
 #define ACPI_AC_CLASS                  "ac_adapter"
 #define ACPI_SBS_DEVICE_NAME           "Smart Battery System"
-#define ACPI_SBS_FILE_INFO             "info"
-#define ACPI_SBS_FILE_STATE            "state"
-#define ACPI_SBS_FILE_ALARM            "alarm"
 #define ACPI_BATTERY_DIR_NAME          "BAT%i"
 #define ACPI_AC_DIR_NAME               "AC0"
 
--

Applied as 5.8 material, thanks!