Date: Fri, 24 Feb 2006 15:12:29 +0900
Message-ID: <87acchz3n6.wl%muneda.takahiro@jp.fujitsu.com>
From: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
To: Kristen Accardi <kristen.c.accardi@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
       pcihpd-discuss@lists.sourceforge.net, greg@kroah.com,
       len.brown@intel.com, muneda.takahiro@jp.fujitsu.com, pavel@ucw.cz
Subject: Re: [patch 2/3] acpiphp: add dock event handling
In-Reply-To: <1140724577.11750.17.camel@whizzy>
References: <20060223195022.747891000@intel.com>
	<1140724577.11750.17.camel@whizzy>
User-Agent: Wanderlust/2.14.1 (Bad Medicine-pre) SEMI/1.14.6 (Maruoka) LIMIT/1.14.9 (Domyoji) APEL/10.6 Emacs/22.0.50 (i686-pc-linux-gnu) MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1353
Lines: 44

At Thu, 23 Feb 2006 11:56:17 -0800,
Kristen Accardi <kristen.c.accardi@intel.com> wrote:
> 
> @@ -828,11 +862,21 @@ static int acpiphp_bus_add(struct acpiph
>  		dbg("no parent device, assuming NULL\n");
>  		pdevice = NULL;
>  	}
> +	if (!acpi_bus_get_device(func->handle, &device)) {
> +		dbg("bus exists... trim\n");
> +		/* this shouldn't be in here, so remove
> +		 * the bus then re-add it...
> +		 */
> +		ret_val = acpi_bus_trim(device, 1);
> +		dbg("acpi_bus_trim return %x\n", ret_val);
> +	}
>  	ret_val = acpi_bus_add(&device, pdevice, func->handle,
> -			ACPI_BUS_TYPE_DEVICE);
> -	if (ret_val)
> -		dbg("cannot add bridge to acpi list\n");
> -
> +		ACPI_BUS_TYPE_DEVICE);
> +	if (ret_val) {
> +		dbg("error adding bus, %x\n",
> +			-ret_val);
> +		goto acpiphp_bus_add_out;
> +	}
>  	/*
>  	 * try to start anyway.  We could have failed to add
>  	 * simply because this bus had previously been added

Hi Kristen,

Why don't you call acpi_bus_trim() when the device is
removed. This time, eject_dock() or disable_device()?
So you don't need to call acpi_bus_trim() as error case.

Thanks,
MUNE

-
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/