OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 /* mode special file */
 static DEVICE_ATTR(mode, 0644, swconfig_trig_mode_show,
 		   swconfig_trig_mode_store);
-static int
+static void
 swconfig_trig_activate(struct led_classdev *led_cdev)
+{
 	struct switch_led_trigger *sw_trig;
+	struct swconfig_trig_data *trig_data;
+	int err;
-	struct swconfig_trig_data *trig_data;
+	if (led_cdev->trigger->activate != swconfig_trig_activate)
-	int err;
+		return;
 	trig_data = kzalloc(sizeof(struct swconfig_trig_data), GFP_KERNEL);
 	if (!trig_data)
-		return -ENOMEM;
+		return;
 	err = device_create_file(led_cdev->dev, &dev_attr_mode);
 	if (err)
 		goto err_mode_free;
-	return 0;
+	return;
 err_mode_free:
 	device_remove_file(led_cdev->dev, &dev_attr_speed_mask);
 err_dev_free:
-	device_remove_file(led_cdev->dev, &dev_attr_port_mask);
-err_free:
-	led_cdev->trigger_data = NULL;
-	kfree(trig_data);
-	return err;
-}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)
+	device_remove_file(led_cdev->dev, &dev_attr_port_mask);
-static void
 swconfig_trig_activate_void(struct led_classdev *led_cdev)
 err_free:
-	swconfig_trig_activate(led_cdev);
+	led_cdev->trigger_data = NULL;
 	kfree(trig_data);
 	if (!sw_trig)
 		return -ENOMEM;
 	sw_trig->swdev = swdev;
-	sw_trig->trig.name = swdev->devname;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)
-	sw_trig->trig.activate = swconfig_trig_activate_void;
-#else
+	sw_trig->trig.name = swdev->devname;
-	sw_trig->trig.activate = swconfig_trig_activate;
-#endif
+	sw_trig->trig.activate = swconfig_trig_activate;
 	sw_trig->trig.deactivate = swconfig_trig_deactivate;