enable tun/tap/iptables

hc

2024-05-10 ee930fffee469d076998274a2ca55e13dc1efb67

 kernel/drivers/rtc/rtc-s5m.c
..
..
@@ -406,9 +406,7 @@
406
406
 		return -EINVAL;
407
407
 	}
408
408
 
409
-	dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
410
-		1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday,
411
-		tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_wday);
409
+	dev_dbg(dev, "%s: %ptR(%d)\n", __func__, tm, tm->tm_wday);
412
410
 
413
411
 	return 0;
414
412
 }
..
..
@@ -436,9 +434,7 @@
436
434
 	if (ret < 0)
437
435
 		return ret;
438
436
 
439
-	dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
440
-		1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday,
441
-		tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_wday);
437
+	dev_dbg(dev, "%s: %ptR(%d)\n", __func__, tm, tm->tm_wday);
442
438
 
443
439
 	ret = regmap_raw_write(info->regmap, info->regs->time, data,
444
440
 			info->regs->regs_count);
..
..
@@ -490,11 +486,7 @@
490
486
 		return -EINVAL;
491
487
 	}
492
488
 
493
-	dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
494
-		1900 + alrm->time.tm_year, 1 + alrm->time.tm_mon,
495
-		alrm->time.tm_mday, alrm->time.tm_hour,
496
-		alrm->time.tm_min, alrm->time.tm_sec,
497
-		alrm->time.tm_wday);
489
+	dev_dbg(dev, "%s: %ptR(%d)\n", __func__, &alrm->time, alrm->time.tm_wday);
498
490
 
499
491
 	ret = s5m_check_peding_alarm_interrupt(info, alrm);
500
492
 
..
..
@@ -513,9 +505,7 @@
513
505
 		return ret;
514
506
 
515
507
 	s5m8767_data_to_tm(data, &tm, info->rtc_24hr_mode);
516
-	dev_dbg(info->dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
517
-		1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday,
518
-		tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday);
508
+	dev_dbg(info->dev, "%s: %ptR(%d)\n", __func__, &tm, tm.tm_wday);
519
509
 
520
510
 	switch (info->device_type) {
521
511
 	case S5M8763X:
..
..
@@ -558,9 +548,7 @@
558
548
 		return ret;
559
549
 
560
550
 	s5m8767_data_to_tm(data, &tm, info->rtc_24hr_mode);
561
-	dev_dbg(info->dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
562
-		1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday,
563
-		tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday);
551
+	dev_dbg(info->dev, "%s: %ptR(%d)\n", __func__, &tm, tm.tm_wday);
564
552
 
565
553
 	switch (info->device_type) {
566
554
 	case S5M8763X:
..
..
@@ -620,10 +608,7 @@
620
608
 		return -EINVAL;
621
609
 	}
622
610
 
623
-	dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
624
-		1900 + alrm->time.tm_year, 1 + alrm->time.tm_mon,
625
-		alrm->time.tm_mday, alrm->time.tm_hour, alrm->time.tm_min,
626
-		alrm->time.tm_sec, alrm->time.tm_wday);
611
+	dev_dbg(dev, "%s: %ptR(%d)\n", __func__, &alrm->time, alrm->time.tm_wday);
627
612
 
628
613
 	ret = s5m_rtc_stop_alarm(info);
629
614
 	if (ret < 0)
..
..
@@ -775,10 +760,10 @@
775
760
 		return -ENODEV;
776
761
 	}
777
762
 
778
-	info->i2c = i2c_new_dummy(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
779
-	if (!info->i2c) {
763
+	info->i2c = i2c_new_dummy_device(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
764
+	if (IS_ERR(info->i2c)) {
780
765
 		dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n");
781
-		return -ENODEV;
766
+		return PTR_ERR(info->i2c);
782
767
 	}
783
768
 
784
769
 	info->regmap = devm_regmap_init_i2c(info->i2c, regmap_cfg);