Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02fc76f6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Create sysfs via snd_card_add_dev_attr()



Use the new helper function to create sysfs entries in the card more
gracefully without races.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6bbc7fed
Loading
Loading
Loading
Loading
+13 −25
Original line number Original line Diff line number Diff line
@@ -330,6 +330,18 @@ static DEVICE_ATTR_RO(device_id);
static DEVICE_ATTR_RO(firmware_version);
static DEVICE_ATTR_RO(firmware_version);
static DEVICE_ATTR_RO(serial_number);
static DEVICE_ATTR_RO(serial_number);


static struct attribute *pod_dev_attrs[] = {
	&dev_attr_device_id.attr,
	&dev_attr_firmware_version.attr,
	&dev_attr_serial_number.attr,
	NULL
};

static const struct attribute_group pod_dev_attr_group = {
	.name = "pod",
	.attrs = pod_dev_attrs,
};

/* control info callback */
/* control info callback */
static int snd_pod_control_monitor_info(struct snd_kcontrol *kcontrol,
static int snd_pod_control_monitor_info(struct snd_kcontrol *kcontrol,
					struct snd_ctl_elem_info *uinfo)
					struct snd_ctl_elem_info *uinfo)
@@ -387,34 +399,10 @@ static void line6_pod_disconnect(struct usb_line6 *line6)
	struct usb_line6_pod *pod = (struct usb_line6_pod *)line6;
	struct usb_line6_pod *pod = (struct usb_line6_pod *)line6;
	struct device *dev = line6->ifcdev;
	struct device *dev = line6->ifcdev;


	/* remove sysfs entries: */
	device_remove_file(dev, &dev_attr_device_id);
	device_remove_file(dev, &dev_attr_firmware_version);
	device_remove_file(dev, &dev_attr_serial_number);

	del_timer_sync(&pod->startup_timer);
	del_timer_sync(&pod->startup_timer);
	cancel_work_sync(&pod->startup_work);
	cancel_work_sync(&pod->startup_work);
}
}


/*
	Create sysfs entries.
*/
static int pod_create_files2(struct device *dev)
{
	int err;

	err = device_create_file(dev, &dev_attr_device_id);
	if (err < 0)
		return err;
	err = device_create_file(dev, &dev_attr_firmware_version);
	if (err < 0)
		return err;
	err = device_create_file(dev, &dev_attr_serial_number);
	if (err < 0)
		return err;
	return 0;
}

/*
/*
	 Try to init POD device.
	 Try to init POD device.
*/
*/
@@ -431,7 +419,7 @@ static int pod_init(struct usb_line6 *line6,
	INIT_WORK(&pod->startup_work, pod_startup4);
	INIT_WORK(&pod->startup_work, pod_startup4);


	/* create sysfs entries: */
	/* create sysfs entries: */
	err = pod_create_files2(line6->ifcdev);
	err = snd_card_add_dev_attr(line6->card, &pod_dev_attr_group);
	if (err < 0)
	if (err < 0)
		return err;
		return err;