lkml.org 
[lkml]   [2007]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH] ACPI: ibm-acpi: allow module to load when acpi notifiers can't be set (v2)
    Date
    Applied.


    On Thursday 15 March 2007 15:15, Henrique de Moraes Holschuh wrote:
    > This patch allows for ibm-acpi to coexist (with diminished functionality) with
    > other drivers like ACPI_BAY. ibm-acpi will simply disable the functions it is
    > not able to register ACPI notifiers for.
    >
    > Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    > Cc: Chris Wedgwood <cw@f00f.org>
    > Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    > ---
    >
    > There was a minor problem in the first version of the patch, which I didn't
    > notice when backporting from acpi-test. This is a fixed version. Sorry
    > about this.
    >
    > Len, you can pull this patch from:
    > git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
    > branch for-upstream/acpi-release
    >
    > Please send it to Linus for merge in 2.6.21.
    >
    > It will clash with the patches in acpi-test that are waiting for 2.6.22.
    > I will rediff those, and send you a pull request when this patch
    > gets accepted in mainline.

    ok

    thanks Henrique,
    -Len


    > drivers/acpi/ibm_acpi.c | 19 ++++++++++++++++---
    > 1 files changed, 16 insertions(+), 3 deletions(-)
    >
    > diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
    > index 3690136..dc10966 100644
    > --- a/drivers/acpi/ibm_acpi.c
    > +++ b/drivers/acpi/ibm_acpi.c
    > @@ -2507,7 +2507,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
    > ret = acpi_bus_get_device(*ibm->handle, &ibm->device);
    > if (ret < 0) {
    > printk(IBM_ERR "%s device not present\n", ibm->name);
    > - return 0;
    > + return -ENODEV;
    > }
    >
    > acpi_driver_data(ibm->device) = ibm;
    > @@ -2516,8 +2516,13 @@ static int __init setup_notify(struct ibm_struct *ibm)
    > status = acpi_install_notify_handler(*ibm->handle, ibm->type,
    > dispatch_notify, ibm);
    > if (ACPI_FAILURE(status)) {
    > - printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",
    > - ibm->name, status);
    > + if (status == AE_ALREADY_EXISTS) {
    > + printk(IBM_NOTICE "another device driver is already handling %s events\n",
    > + ibm->name);
    > + } else {
    > + printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",
    > + ibm->name, status);
    > + }
    > return -ENODEV;
    > }
    > ibm->notify_installed = 1;
    > @@ -2553,6 +2558,8 @@ static int __init register_driver(struct ibm_struct *ibm)
    > return ret;
    > }
    >
    > +static void ibm_exit(struct ibm_struct *ibm);
    > +
    > static int __init ibm_init(struct ibm_struct *ibm)
    > {
    > int ret;
    > @@ -2594,6 +2601,12 @@ static int __init ibm_init(struct ibm_struct *ibm)
    >
    > if (ibm->notify) {
    > ret = setup_notify(ibm);
    > + if (ret == -ENODEV) {
    > + printk(IBM_NOTICE "disabling subdriver %s\n",
    > + ibm->name);
    > + ibm_exit(ibm);
    > + return 0;
    > + }
    > if (ret < 0)
    > return ret;
    > }
    > --
    > 1.5.0.3
    >
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-16 07:47    [W:0.026 / U:1.020 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site