hid: intel-ish-hid: use dev_groups and not dev_attrs for bus_type (480104b7) · Commits · 戴 / test

The dev_attrs field has long been "depreciated" and is finally being removed, so move the driver to use the "correct" dev_groups field instead for struct bus_type. Acked-by:

Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Acked-by:

Jiri Kosina <jikos@kernel.org> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: Wei Yongjun <weiyj.lk@gmail.com> Cc: Bhumika Goyal <bhumirks@gmail.com> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: <linux-input@vger.kernel.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/hid/intel-ish-hid/ishtp/bus.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -321,11 +321,13 @@ static ssize_t modalias_show(struct device dev, struct device_attribute a,
		len = snprintf(buf, PAGE_SIZE, "ishtp:%s\n", dev_name(dev));
		return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
		}
		static DEVICE_ATTR_RO(modalias);

		static struct device_attribute ishtp_cl_dev_attrs[] = {
		__ATTR_RO(modalias),
		__ATTR_NULL,
		static struct attribute *ishtp_cl_dev_attrs[] = {
		&dev_attr_modalias.attr,
		NULL,
		};
		ATTRIBUTE_GROUPS(ishtp_cl_dev);

		static int ishtp_cl_uevent(struct device dev, struct kobj_uevent_env env)
		{
		@@ -346,7 +348,7 @@ static const struct dev_pm_ops ishtp_cl_bus_dev_pm_ops = {

		static struct bus_type ishtp_cl_bus_type = {
		.name = "ishtp",
		.dev_attrs = ishtp_cl_dev_attrs,
		.dev_groups = ishtp_cl_dev_groups,
		.probe = ishtp_cl_device_probe,
		.remove = ishtp_cl_device_remove,
		.pm = &ishtp_cl_bus_dev_pm_ops,

Admin message