| Message ID | 20090927075254.GA20847@elte.hu (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Headers | show |
On Sun, 27 Sep 2009, Ingo Molnar wrote: > > drivers/platform/x86/thinkpad_acpi.c | 632 +++++++++++++++++++--------- > > -tip testing found that these changes caused a build failure > in drivers/platform/x86/thinkpad_acpi.c when > !CONFIG_THINKPAD_ACPI_HOTKEY_POLL - the fix is attached > below. Fixed by a different patch, which will hit mainline soon. Len already merged the fix in acpi-test. BTW, the function _is_ used even when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined...
> > > drivers/platform/x86/thinkpad_acpi.c | 632 +++++++++++++++++++--------- > > > > -tip testing found that these changes caused a build failure > > in drivers/platform/x86/thinkpad_acpi.c when > > !CONFIG_THINKPAD_ACPI_HOTKEY_POLL - the fix is attached below. > > Fixed by a different patch, which will hit mainline soon.... Ingo, 2.6.32-rc1 should build fine* -- let me know if it doesn't. thanks, Len Brown, Intel Open Source Technology Center * module this message, which Henruque assures me will go away soon drivers/platform/x86/thinkpad_acpi.c:2225: warning: ‘tpacpi_hotkey_driver_mask_set’ defined but not used
* Len Brown <lenb@kernel.org> wrote: > > > > > drivers/platform/x86/thinkpad_acpi.c | 632 +++++++++++++++++++--------- > > > > > > -tip testing found that these changes caused a build failure > > > in drivers/platform/x86/thinkpad_acpi.c when > > > !CONFIG_THINKPAD_ACPI_HOTKEY_POLL - the fix is attached below. > > > > Fixed by a different patch, which will hit mainline soon.... > > Ingo, > 2.6.32-rc1 should build fine* -- let me know if it doesn't. > > thanks, > Len Brown, Intel Open Source Technology Center > > * module this message, which Henruque assures me will go away soon > drivers/platform/x86/thinkpad_acpi.c:2225: warning: > ‘tpacpi_hotkey_driver_mask_set’ defined but not used well, the warning is fixed properly in my patch, as pointed out in the changelog. Have you read that? Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 28 Sep 2009, Ingo Molnar wrote: > * Len Brown <lenb@kernel.org> wrote: > > > > > drivers/platform/x86/thinkpad_acpi.c | 632 +++++++++++++++++++--------- > > > > > > > > -tip testing found that these changes caused a build failure > > > > in drivers/platform/x86/thinkpad_acpi.c when > > > > !CONFIG_THINKPAD_ACPI_HOTKEY_POLL - the fix is attached below. > > > > > > Fixed by a different patch, which will hit mainline soon.... > > > > Ingo, > > 2.6.32-rc1 should build fine* -- let me know if it doesn't. > > > > thanks, > > Len Brown, Intel Open Source Technology Center > > > > * module this message, which Henruque assures me will go away soon > > drivers/platform/x86/thinkpad_acpi.c:2225: warning: > > ???tpacpi_hotkey_driver_mask_set??? defined but not used > > well, the warning is fixed properly in my patch, as pointed out in the > changelog. Have you read that? Your patch will break the driver when the functionality that uses tpacpi_hotkey_driver_mask_set() lands in mainline. That functionality is already in a subsystem tree waiting a push to Linus. Of course, you had no way to know that, and I failed to convey that detail (mostly because _I_ screwed up and forgot I had that patch already applied) when I replied to you. Sorry about that. The patch adding that functionality had already been submitted at the time you sent in your patch, and it will be merged through the backlight tree very soon. That patch couldn't arrive earlier because it needed changes both in the backlight tree AND in the ACPI tree, and nobody knew which tree would merge first. Now that all dependencies (both from backlight and ACPI) are already in mainline, I asked Richard Purdie to send it to Linus together with his next batch of backlight updates. That will silence the warning about tpacpi_hotkey_driver_mask_set().
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 3910f2f..a52dbc9 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2216,6 +2216,7 @@ static int hotkey_user_mask_set(const u32 mask) return rc; } +#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL /* * Sets the driver hotkey mask. * @@ -2244,6 +2245,7 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask) return rc; } +#endif static int hotkey_status_get(int *status) {