Re: [patch 2/3] acpiphp: add dock event handling

[MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>]

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