ACPI: Schedule /proc/acpi/event for removal

Schedule /proc/acpi/event for removal in 6 months.

Re-name acpi_bus_generate_event() to acpi_bus_generate_proc_event()
to make sure there is no confusion that it is for /proc/acpi/event only.

Add CONFIG_ACPI_PROC_EVENT to allow removal of /proc/acpi/event.
There is no functional change if CONFIG_ACPI_PROC_EVENT=y

Signed-off-by: Len Brown <len.brown@intel.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index d0fc4fd212e6..f8ae58f01637 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -732,7 +732,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                 lcd_blank(FB_BLANK_POWERDOWN);
         }
 
-        acpi_bus_generate_event(hotk->device, event,
+        acpi_bus_generate_proc_event(hotk->device, event,
                                 hotk->event_count[event % 128]++);
 
         return;
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 91da6880ae93..743bd49ae6f5 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -904,7 +904,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
 
         dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
         sony_laptop_report_input_event(ev);
-        acpi_bus_generate_event(sony_nc_acpi_device, 1, ev);
+        acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
 }
 
 static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
@@ -2292,7 +2292,7 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
 
 found:
         sony_laptop_report_input_event(device_event);
-        acpi_bus_generate_event(spic_dev.acpi_dev, 1, device_event);
+        acpi_bus_generate_proc_event(spic_dev.acpi_dev, 1, device_event);
         sonypi_compat_report_event(device_event);
 
         return IRQ_HANDLED;
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index d0825a34a7b0..bb8956d0c104 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -1190,10 +1190,10 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
                 }
 
                 if (sendacpi)
-                        acpi_bus_generate_event(ibm->acpi->device, event, hkey);
+                        acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
         } else {
                 printk(IBM_ERR "unknown hotkey notification event %d\n", event);
-                acpi_bus_generate_event(ibm->acpi->device, event, 0);
+                acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
         }
 }
 
@@ -2179,7 +2179,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
                        event, _sta(dock_handle));
                 data = 0;       /* unknown */
         }
-        acpi_bus_generate_event(ibm->acpi->device, event, data);
+        acpi_bus_generate_proc_event(ibm->acpi->device, event, data);
         acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
                                           ibm->acpi->device->dev.bus_id,
                                           event, data);
@@ -2280,7 +2280,7 @@ static int __init bay_init(struct ibm_init_struct *iibm)
 
 static void bay_notify(struct ibm_struct *ibm, u32 event)
 {
-        acpi_bus_generate_event(ibm->acpi->device, event, 0);
+        acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
         acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
                                           ibm->acpi->device->dev.bus_id,
                                           event, 0);