diff mbox

ideapad_laptop: add an event for mic mute hotkey

Message ID 1464593208-13190-1-git-send-email-alex.hung@canonical.com (mailing list archive)
State Changes Requested, archived
Headers show

Commit Message

Alex Hung May 30, 2016, 7:26 a.m. UTC
Newer ideapad supports new mic new hotkey, and it is implemented
via ACPI interface.  This patch conver the mic mute event to
a keycode KEY_MICMUTE

Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 drivers/platform/x86/ideapad-laptop.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Ike Panhc June 3, 2016, 8:33 a.m. UTC | #1
On 05/30/2016 03:26 PM, Alex Hung wrote:
> Newer ideapad supports new mic new hotkey, and it is implemented
> via ACPI interface.  This patch conver the mic mute event to
> a keycode KEY_MICMUTE
> 
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  drivers/platform/x86/ideapad-laptop.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
> index 4a23fbc..aa87a42 100644
> --- a/drivers/platform/x86/ideapad-laptop.c
> +++ b/drivers/platform/x86/ideapad-laptop.c
> @@ -567,6 +567,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv)
>  static const struct key_entry ideapad_keymap[] = {
>  	{ KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
>  	{ KE_KEY, 7,  { KEY_CAMERA } },
> +	{ KE_KEY, 8,  { KEY_MICMUTE } },
>  	{ KE_KEY, 11, { KEY_F16 } },
>  	{ KE_KEY, 13, { KEY_WLAN } },
>  	{ KE_KEY, 16, { KEY_PROG1 } },
> @@ -809,6 +810,9 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
>  				break;
>  			case 13:
>  			case 11:
> +			case 8:

fall through is easier to read

> +				ideapad_input_report(priv, vpc_bit);
> +				break;

so above two lines are not necessary.

>  			case 7:
>  			case 6:
>  				ideapad_input_report(priv, vpc_bit);
> 

--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darren Hart June 7, 2016, 9:54 p.m. UTC | #2
On Fri, Jun 03, 2016 at 04:33:34PM +0800, Ike Panhc wrote:
> On 05/30/2016 03:26 PM, Alex Hung wrote:
> > Newer ideapad supports new mic new hotkey, and it is implemented
> > via ACPI interface.  This patch conver the mic mute event to
> > a keycode KEY_MICMUTE
> > 
> > Signed-off-by: Alex Hung <alex.hung@canonical.com>
> > ---
> >  drivers/platform/x86/ideapad-laptop.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
> > index 4a23fbc..aa87a42 100644
> > --- a/drivers/platform/x86/ideapad-laptop.c
> > +++ b/drivers/platform/x86/ideapad-laptop.c
> > @@ -567,6 +567,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv)
> >  static const struct key_entry ideapad_keymap[] = {
> >  	{ KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
> >  	{ KE_KEY, 7,  { KEY_CAMERA } },
> > +	{ KE_KEY, 8,  { KEY_MICMUTE } },
> >  	{ KE_KEY, 11, { KEY_F16 } },
> >  	{ KE_KEY, 13, { KEY_WLAN } },
> >  	{ KE_KEY, 16, { KEY_PROG1 } },
> > @@ -809,6 +810,9 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
> >  				break;
> >  			case 13:
> >  			case 11:
> > +			case 8:
> 
> fall through is easier to read
> 
> > +				ideapad_input_report(priv, vpc_bit);
> > +				break;
> 
> so above two lines are not necessary.

Are you happy with the changes otherwise Ike?

> 
> >  			case 7:
> >  			case 6:
> >  				ideapad_input_report(priv, vpc_bit);
> > 

Thanks,
Ike Panhc June 8, 2016, 3:26 a.m. UTC | #3
On 06/08/2016 05:54 AM, Darren Hart wrote:
> On Fri, Jun 03, 2016 at 04:33:34PM +0800, Ike Panhc wrote:
>> On 05/30/2016 03:26 PM, Alex Hung wrote:
>>> Newer ideapad supports new mic new hotkey, and it is implemented
>>> via ACPI interface.  This patch conver the mic mute event to
>>> a keycode KEY_MICMUTE
>>>
>>> Signed-off-by: Alex Hung <alex.hung@canonical.com>
>>> ---
>>>  drivers/platform/x86/ideapad-laptop.c | 4 ++++
>>>  1 file changed, 4 insertions(+)
>>>
>>> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
>>> index 4a23fbc..aa87a42 100644
>>> --- a/drivers/platform/x86/ideapad-laptop.c
>>> +++ b/drivers/platform/x86/ideapad-laptop.c
>>> @@ -567,6 +567,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv)
>>>  static const struct key_entry ideapad_keymap[] = {
>>>  	{ KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
>>>  	{ KE_KEY, 7,  { KEY_CAMERA } },
>>> +	{ KE_KEY, 8,  { KEY_MICMUTE } },
>>>  	{ KE_KEY, 11, { KEY_F16 } },
>>>  	{ KE_KEY, 13, { KEY_WLAN } },
>>>  	{ KE_KEY, 16, { KEY_PROG1 } },
>>> @@ -809,6 +810,9 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
>>>  				break;
>>>  			case 13:
>>>  			case 11:
>>> +			case 8:
>>
>> fall through is easier to read
>>
>>> +				ideapad_input_report(priv, vpc_bit);
>>> +				break;
>>
>> so above two lines are not necessary.
> 
> Are you happy with the changes otherwise Ike?
> 
>>
>>>  			case 7:
>>>  			case 6:
>>>  				ideapad_input_report(priv, vpc_bit);
>>>
> 
> Thanks,
> 

Yes. Looks good to me.
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darren Hart June 8, 2016, 8:02 p.m. UTC | #4
On Wed, Jun 08, 2016 at 11:26:44AM +0800, Ike Panhc wrote:
> On 06/08/2016 05:54 AM, Darren Hart wrote:
> > On Fri, Jun 03, 2016 at 04:33:34PM +0800, Ike Panhc wrote:
> >> On 05/30/2016 03:26 PM, Alex Hung wrote:
> >>> Newer ideapad supports new mic new hotkey, and it is implemented
> >>> via ACPI interface.  This patch conver the mic mute event to
> >>> a keycode KEY_MICMUTE
> >>>
> >>> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> >>> ---
> >>>  drivers/platform/x86/ideapad-laptop.c | 4 ++++
> >>>  1 file changed, 4 insertions(+)
> >>>
> >>> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
> >>> index 4a23fbc..aa87a42 100644
> >>> --- a/drivers/platform/x86/ideapad-laptop.c
> >>> +++ b/drivers/platform/x86/ideapad-laptop.c
> >>> @@ -567,6 +567,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv)
> >>>  static const struct key_entry ideapad_keymap[] = {
> >>>  	{ KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
> >>>  	{ KE_KEY, 7,  { KEY_CAMERA } },
> >>> +	{ KE_KEY, 8,  { KEY_MICMUTE } },
> >>>  	{ KE_KEY, 11, { KEY_F16 } },
> >>>  	{ KE_KEY, 13, { KEY_WLAN } },
> >>>  	{ KE_KEY, 16, { KEY_PROG1 } },
> >>> @@ -809,6 +810,9 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
> >>>  				break;
> >>>  			case 13:
> >>>  			case 11:
> >>> +			case 8:
> >>
> >> fall through is easier to read
> >>
> >>> +				ideapad_input_report(priv, vpc_bit);
> >>> +				break;
> >>
> >> so above two lines are not necessary.
> > 
> > Are you happy with the changes otherwise Ike?
> > 
> >>
> >>>  			case 7:
> >>>  			case 6:
> >>>  				ideapad_input_report(priv, vpc_bit);
> >>>
> > 
> > Thanks,
> > 
> 
> Yes. Looks good to me.
> 

Thanks Ike, in the future, please provide an explicit Acked, Reviewed, or
Tested-by so I can accurately record your level of review. I've added your
Acked-by here.
diff mbox

Patch

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 4a23fbc..aa87a42 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -567,6 +567,7 @@  static void ideapad_sysfs_exit(struct ideapad_private *priv)
 static const struct key_entry ideapad_keymap[] = {
 	{ KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
 	{ KE_KEY, 7,  { KEY_CAMERA } },
+	{ KE_KEY, 8,  { KEY_MICMUTE } },
 	{ KE_KEY, 11, { KEY_F16 } },
 	{ KE_KEY, 13, { KEY_WLAN } },
 	{ KE_KEY, 16, { KEY_PROG1 } },
@@ -809,6 +810,9 @@  static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
 				break;
 			case 13:
 			case 11:
+			case 8:
+				ideapad_input_report(priv, vpc_bit);
+				break;
 			case 7:
 			case 6:
 				ideapad_input_report(priv, vpc_bit);