forked from Minki/linux
Staging: quickstart: Rename quickstart_btn to quickstart_button
Signed-off-by: Szymon Janc <szymon@janc.net.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
21c1ddf314
commit
3c92e38dc4
@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
|
||||
#define QUICKSTART_EVENT_WAKE 0x02
|
||||
#define QUICKSTART_EVENT_RUNTIME 0x80
|
||||
|
||||
struct quickstart_btn {
|
||||
struct quickstart_button {
|
||||
char *name;
|
||||
unsigned int id;
|
||||
struct list_head list;
|
||||
@ -60,11 +60,11 @@ struct quickstart_btn {
|
||||
|
||||
struct quickstart_acpi {
|
||||
struct acpi_device *device;
|
||||
struct quickstart_btn *btn;
|
||||
struct quickstart_button *button;
|
||||
};
|
||||
|
||||
static LIST_HEAD(buttons);
|
||||
static struct quickstart_btn *pressed;
|
||||
static struct quickstart_button *pressed;
|
||||
|
||||
static struct input_dev *quickstart_input;
|
||||
|
||||
@ -74,7 +74,7 @@ static ssize_t quickstart_buttons_show(struct device *dev,
|
||||
char *buf)
|
||||
{
|
||||
int count = 0;
|
||||
struct quickstart_btn *b;
|
||||
struct quickstart_button *b;
|
||||
|
||||
if (list_empty(&buttons))
|
||||
return snprintf(buf, PAGE_SIZE, "none");
|
||||
@ -116,9 +116,9 @@ static ssize_t quickstart_pressed_button_store(struct device *dev,
|
||||
}
|
||||
|
||||
/* Helper functions */
|
||||
static struct quickstart_btn *quickstart_buttons_add(void)
|
||||
static struct quickstart_button *quickstart_buttons_add(void)
|
||||
{
|
||||
struct quickstart_btn *b;
|
||||
struct quickstart_button *b;
|
||||
|
||||
b = kzalloc(sizeof(*b), GFP_KERNEL);
|
||||
if (!b)
|
||||
@ -129,7 +129,7 @@ static struct quickstart_btn *quickstart_buttons_add(void)
|
||||
return b;
|
||||
}
|
||||
|
||||
static void quickstart_button_del(struct quickstart_btn *data)
|
||||
static void quickstart_button_del(struct quickstart_button *data)
|
||||
{
|
||||
if (!data)
|
||||
return;
|
||||
@ -141,7 +141,7 @@ static void quickstart_button_del(struct quickstart_btn *data)
|
||||
|
||||
static void quickstart_buttons_free(void)
|
||||
{
|
||||
struct quickstart_btn *b, *n;
|
||||
struct quickstart_button *b, *n;
|
||||
|
||||
list_for_each_entry_safe(b, n, &buttons, list)
|
||||
quickstart_button_del(b);
|
||||
@ -157,12 +157,12 @@ static void quickstart_acpi_notify(acpi_handle handle, u32 event, void *data)
|
||||
|
||||
switch (event) {
|
||||
case QUICKSTART_EVENT_WAKE:
|
||||
pressed = quickstart->btn;
|
||||
pressed = quickstart->button;
|
||||
break;
|
||||
case QUICKSTART_EVENT_RUNTIME:
|
||||
input_report_key(quickstart_input, quickstart->btn->id, 1);
|
||||
input_report_key(quickstart_input, quickstart->button->id, 1);
|
||||
input_sync(quickstart_input);
|
||||
input_report_key(quickstart_input, quickstart->btn->id, 0);
|
||||
input_report_key(quickstart_input, quickstart->button->id, 0);
|
||||
input_sync(quickstart_input);
|
||||
break;
|
||||
default:
|
||||
@ -184,7 +184,7 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
|
||||
&buffer);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
printk(KERN_ERR "quickstart: %s GHID method failed.\n",
|
||||
quickstart->btn->name);
|
||||
quickstart->button->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -195,21 +195,21 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
|
||||
*/
|
||||
switch (buffer.length) {
|
||||
case 1:
|
||||
quickstart->btn->id = *(uint8_t *)buffer.pointer;
|
||||
quickstart->button->id = *(uint8_t *)buffer.pointer;
|
||||
break;
|
||||
case 2:
|
||||
quickstart->btn->id = *(uint16_t *)buffer.pointer;
|
||||
quickstart->button->id = *(uint16_t *)buffer.pointer;
|
||||
break;
|
||||
case 4:
|
||||
quickstart->btn->id = *(uint32_t *)buffer.pointer;
|
||||
quickstart->button->id = *(uint32_t *)buffer.pointer;
|
||||
break;
|
||||
case 8:
|
||||
quickstart->btn->id = *(uint64_t *)buffer.pointer;
|
||||
quickstart->button->id = *(uint64_t *)buffer.pointer;
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "quickstart: %s GHID method returned buffer "
|
||||
"of unexpected length %u\n",
|
||||
quickstart->btn->name, buffer.length);
|
||||
quickstart->button->name, buffer.length);
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
@ -229,14 +229,14 @@ static int quickstart_acpi_config(struct quickstart_acpi *quickstart)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Add new button to list */
|
||||
quickstart->btn = quickstart_buttons_add();
|
||||
if (!quickstart->btn) {
|
||||
quickstart->button = quickstart_buttons_add();
|
||||
if (!quickstart->button) {
|
||||
kfree(name);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
quickstart->btn->name = name;
|
||||
strcpy(quickstart->btn->name, bid);
|
||||
quickstart->button->name = name;
|
||||
strcpy(quickstart->button->name, bid);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -285,7 +285,7 @@ fail_ghid:
|
||||
quickstart_acpi_notify);
|
||||
|
||||
fail_installnotify:
|
||||
quickstart_button_del(quickstart->btn);
|
||||
quickstart_button_del(quickstart->button);
|
||||
|
||||
fail_config:
|
||||
|
||||
@ -362,7 +362,7 @@ static void quickstart_exit(void)
|
||||
|
||||
static int __init quickstart_init_input(void)
|
||||
{
|
||||
struct quickstart_btn *b;
|
||||
struct quickstart_button *b;
|
||||
int ret;
|
||||
|
||||
quickstart_input = input_allocate_device();
|
||||
|
Loading…
Reference in New Issue
Block a user