@@ -68,7 +68,6 @@ struct led_netdev_data {
68
68
unsigned int last_activity ;
69
69
70
70
unsigned long mode ;
71
- unsigned long blink_delay ;
72
71
int link_speed ;
73
72
__ETHTOOL_DECLARE_LINK_MODE_MASK (supported_link_modes );
74
73
u8 duplex ;
@@ -87,10 +86,6 @@ static void set_baseline_state(struct led_netdev_data *trigger_data)
87
86
/* Already validated, hw control is possible with the requested mode */
88
87
if (trigger_data -> hw_control ) {
89
88
led_cdev -> hw_control_set (led_cdev , trigger_data -> mode );
90
- if (led_cdev -> blink_set ) {
91
- led_cdev -> blink_set (led_cdev , & trigger_data -> blink_delay ,
92
- & trigger_data -> blink_delay );
93
- }
94
89
95
90
return ;
96
91
}
@@ -459,11 +454,10 @@ static ssize_t interval_store(struct device *dev,
459
454
size_t size )
460
455
{
461
456
struct led_netdev_data * trigger_data = led_trigger_get_drvdata (dev );
462
- struct led_classdev * led_cdev = trigger_data -> led_cdev ;
463
457
unsigned long value ;
464
458
int ret ;
465
459
466
- if (trigger_data -> hw_control && ! led_cdev -> blink_set )
460
+ if (trigger_data -> hw_control )
467
461
return - EINVAL ;
468
462
469
463
ret = kstrtoul (buf , 0 , & value );
@@ -472,13 +466,9 @@ static ssize_t interval_store(struct device *dev,
472
466
473
467
/* impose some basic bounds on the timer interval */
474
468
if (value >= 5 && value <= 10000 ) {
475
- if (trigger_data -> hw_control ) {
476
- trigger_data -> blink_delay = value ;
477
- } else {
478
- cancel_delayed_work_sync (& trigger_data -> work );
469
+ cancel_delayed_work_sync (& trigger_data -> work );
479
470
480
- atomic_set (& trigger_data -> interval , msecs_to_jiffies (value ));
481
- }
471
+ atomic_set (& trigger_data -> interval , msecs_to_jiffies (value ));
482
472
set_baseline_state (trigger_data ); /* resets timer */
483
473
}
484
474
0 commit comments