On Fri, 20 Apr 2018 11:44:30 +0200,
Kai-Heng Feng wrote:
>
> This header will be used for more than just led. Change it to a more
> generic name.
>
> Cc: Mario Limonciello <mario.limonciello@xxxxxxxx>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@xxxxxxxxxxxxx>
BTW, wouldn't it be better postpone the rename?
Renaming a file in a cross-tree patchset makes harder to apply in
general.
thanks,
Takashi
> ---
> v4: Change the commit message to clarify there's no more runtime pm
> warning.
> Also skip the check for thunderbolt attached devices.
>
> v3: Simplify dell_switchable_gfx_is_enabled() by returning bool instead
> of error code.
> Use DMI_DEV_TYPE_OEM_STRING to match Dell System.
>
> v2: Mario suggested to squash the HDA part into the same series.
>
> drivers/platform/x86/dell-laptop.c | 2 +-
> include/linux/{dell-led.h => dell-common.h} | 4 ++--
> sound/pci/hda/dell_wmi_helper.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
> rename include/linux/{dell-led.h => dell-common.h} (61%)
>
> diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
> index c52c6723374b..8ba820e6c3d0 100644
> --- a/drivers/platform/x86/dell-laptop.c
> +++ b/drivers/platform/x86/dell-laptop.c
> @@ -29,7 +29,7 @@
> #include <linux/mm.h>
> #include <linux/i8042.h>
> #include <linux/debugfs.h>
> -#include <linux/dell-led.h>
> +#include <linux/dell-common.h>
> #include <linux/seq_file.h>
> #include <acpi/video.h>
> #include "dell-rbtn.h"
> diff --git a/include/linux/dell-led.h b/include/linux/dell-common.h
> similarity index 61%
> rename from include/linux/dell-led.h
> rename to include/linux/dell-common.h
> index 92521471517f..37e4b614dd74 100644
> --- a/include/linux/dell-led.h
> +++ b/include/linux/dell-common.h
> @@ -1,6 +1,6 @@
> /* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef __DELL_LED_H__
> -#define __DELL_LED_H__
> +#ifndef __DELL_COMMON_H__
> +#define __DELL_COMMON_H__
>
> int dell_micmute_led_set(int on);
>
> diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c
> index 1b48a8c19d28..56050cc3c0ee 100644
> --- a/sound/pci/hda/dell_wmi_helper.c
> +++ b/sound/pci/hda/dell_wmi_helper.c
> @@ -4,7 +4,7 @@
> */
>
> #if IS_ENABLED(CONFIG_DELL_LAPTOP)
> -#include <linux/dell-led.h>
> +#include <linux/dell-common.h>
>
> enum {
> MICMUTE_LED_ON,
> --
> 2.17.0
>
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
