wifi: cfg80211: Annotate struct cfg80211_scan_request with __counted_by

[linux.git] / drivers / platform / x86 / intel / vbtn.c

diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel/vbtn.c
index c5e4e35c8d204317e98d1df2087c6a70a3687e83..6fa1735ad7a49ad64ecc80033d2b1ec564b1114f 100644 (file)
--- a/drivers/platform/x86/intel/vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -325,18 +325,12 @@ static int intel_vbtn_probe(struct platform_device *device)
        return 0;
 }
 
-static int intel_vbtn_remove(struct platform_device *device)
+static void intel_vbtn_remove(struct platform_device *device)
 {
        acpi_handle handle = ACPI_HANDLE(&device->dev);
 
        device_init_wakeup(&device->dev, false);
        acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
-
-       /*
-        * Even if we failed to shut off the event stream, we can still
-        * safely detach from the device.
-        */
-       return 0;
 }
 
 static int intel_vbtn_pm_prepare(struct device *dev)
@@ -377,7 +371,7 @@ static struct platform_driver intel_vbtn_pl_driver = {
                .pm = &intel_vbtn_pm_ops,
        },
        .probe = intel_vbtn_probe,
-       .remove = intel_vbtn_remove,
+       .remove_new = intel_vbtn_remove,
 };
 
 static acpi_status __init