Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A fix for recent sysfs breakage in serio subsystem plus a fixup to
adxl34x driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: adxl34x - Fix bug in definition of ADXL346_2D_ORIENT
Input: serio - fix sysfs layout
+19
-9
+1
-1
drivers/input/misc/adxl34x.c
+1
-1
drivers/input/misc/adxl34x.c
···
158
158
159
159
/* ORIENT ADXL346 only */
160
160
#define ADXL346_2D_VALID (1 << 6)
161
-
#define ADXL346_2D_ORIENT(x) (((x) & 0x3) >> 4)
161
+
#define ADXL346_2D_ORIENT(x) (((x) & 0x30) >> 4)
162
162
#define ADXL346_3D_VALID (1 << 3)
163
163
#define ADXL346_3D_ORIENT(x) ((x) & 0x7)
164
164
#define ADXL346_2D_PORTRAIT_POS 0 /* +X */
+18
-8
drivers/input/serio/serio.c
+18
-8
drivers/input/serio/serio.c
···
455
455
static DEVICE_ATTR_RO(proto);
456
456
static DEVICE_ATTR_RO(id);
457
457
static DEVICE_ATTR_RO(extra);
458
-
static DEVICE_ATTR_RO(modalias);
459
-
static DEVICE_ATTR_WO(drvctl);
460
-
static DEVICE_ATTR(description, S_IRUGO, serio_show_description, NULL);
461
-
static DEVICE_ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode);
462
458
463
459
static struct attribute *serio_device_id_attrs[] = {
464
460
&dev_attr_type.attr,
465
461
&dev_attr_proto.attr,
466
462
&dev_attr_id.attr,
467
463
&dev_attr_extra.attr,
468
-
&dev_attr_modalias.attr,
469
-
&dev_attr_description.attr,
470
-
&dev_attr_drvctl.attr,
471
-
&dev_attr_bind_mode.attr,
472
464
NULL
473
465
};
474
466
···
469
477
.attrs = serio_device_id_attrs,
470
478
};
471
479
480
+
static DEVICE_ATTR_RO(modalias);
481
+
static DEVICE_ATTR_WO(drvctl);
482
+
static DEVICE_ATTR(description, S_IRUGO, serio_show_description, NULL);
483
+
static DEVICE_ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode);
484
+
485
+
static struct attribute *serio_device_attrs[] = {
486
+
&dev_attr_modalias.attr,
487
+
&dev_attr_description.attr,
488
+
&dev_attr_drvctl.attr,
489
+
&dev_attr_bind_mode.attr,
490
+
NULL
491
+
};
492
+
493
+
static struct attribute_group serio_device_attr_group = {
494
+
.attrs = serio_device_attrs,
495
+
};
496
+
472
497
static const struct attribute_group *serio_device_attr_groups[] = {
473
498
&serio_id_attr_group,
499
+
&serio_device_attr_group,
474
500
NULL
475
501
};
476
502