- acpi-remove-__init-__exit-from-sony-add-remove-methods.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     ACPI: remove __init/__exit from Sony .add()/.remove() methods

has been removed from the -mm tree.  Its filename is

     acpi-remove-__init-__exit-from-sony-add-remove-methods.patch

This patch was dropped because it was folded into another patch

------------------------------------------------------
Subject: ACPI: remove __init/__exit from Sony .add()/.remove() methods
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>


Even though the devices claimed by sony_acpi.c can not be hot-plugged, the
driver registration infrastructure allows the .add() and .remove() methods to
be called at any time while the driver is registered.  So remove __init and
__exit from them.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/acpi/sony_acpi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/acpi/sony_acpi.c~acpi-remove-__init-__exit-from-sony-add-remove-methods drivers/acpi/sony_acpi.c
--- devel/drivers/acpi/sony_acpi.c~acpi-remove-__init-__exit-from-sony-add-remove-methods	2006-06-06 17:25:26.000000000 -0700
+++ devel-akpm/drivers/acpi/sony_acpi.c	2006-06-06 17:25:26.000000000 -0700
@@ -258,7 +258,7 @@ static acpi_status sony_walk_callback(ac
 	return AE_OK;
 }
 
-static int __init sony_acpi_add(struct acpi_device *device)
+static int sony_acpi_add(struct acpi_device *device)
 {
 	acpi_status status;
 	int result;
@@ -340,7 +340,7 @@ outwalk:
 }
 
 
-static int __exit sony_acpi_remove(struct acpi_device *device, int type)
+static int sony_acpi_remove(struct acpi_device *device, int type)
 {
 	acpi_status status;
 	struct sony_acpi_value *item;
_

Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are

git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
2.6-sony_acpi4.patch
acpi-remove-__init-__exit-from-sony-add-remove-methods.patch
git-ia64.patch
git-klibc.patch
e100-disable-interrupts-at-boot.patch
vgacon-make-vga_map_mem-take-size-remove-extra-use.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux