mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/hwmon/npcm750-pwm-fan.c
..
..
@@ -629,51 +629,33 @@
629
629
 	}
630
630
 }
631
631
 
632
-static const u32 npcm7xx_pwm_config[] = {
633
-	HWMON_PWM_INPUT,
634
-	HWMON_PWM_INPUT,
635
-	HWMON_PWM_INPUT,
636
-	HWMON_PWM_INPUT,
637
-	HWMON_PWM_INPUT,
638
-	HWMON_PWM_INPUT,
639
-	HWMON_PWM_INPUT,
640
-	HWMON_PWM_INPUT,
641
-	0
642
-};
643
-
644
-static const struct hwmon_channel_info npcm7xx_pwm = {
645
-	.type = hwmon_pwm,
646
-	.config = npcm7xx_pwm_config,
647
-};
648
-
649
-static const u32 npcm7xx_fan_config[] = {
650
-	HWMON_F_INPUT,
651
-	HWMON_F_INPUT,
652
-	HWMON_F_INPUT,
653
-	HWMON_F_INPUT,
654
-	HWMON_F_INPUT,
655
-	HWMON_F_INPUT,
656
-	HWMON_F_INPUT,
657
-	HWMON_F_INPUT,
658
-	HWMON_F_INPUT,
659
-	HWMON_F_INPUT,
660
-	HWMON_F_INPUT,
661
-	HWMON_F_INPUT,
662
-	HWMON_F_INPUT,
663
-	HWMON_F_INPUT,
664
-	HWMON_F_INPUT,
665
-	HWMON_F_INPUT,
666
-	0
667
-};
668
-
669
-static const struct hwmon_channel_info npcm7xx_fan = {
670
-	.type = hwmon_fan,
671
-	.config = npcm7xx_fan_config,
672
-};
673
-
674
632
 static const struct hwmon_channel_info *npcm7xx_info[] = {
675
-	&npcm7xx_pwm,
676
-	&npcm7xx_fan,
633
+	HWMON_CHANNEL_INFO(pwm,
634
+			   HWMON_PWM_INPUT,
635
+			   HWMON_PWM_INPUT,
636
+			   HWMON_PWM_INPUT,
637
+			   HWMON_PWM_INPUT,
638
+			   HWMON_PWM_INPUT,
639
+			   HWMON_PWM_INPUT,
640
+			   HWMON_PWM_INPUT,
641
+			   HWMON_PWM_INPUT),
642
+	HWMON_CHANNEL_INFO(fan,
643
+			   HWMON_F_INPUT,
644
+			   HWMON_F_INPUT,
645
+			   HWMON_F_INPUT,
646
+			   HWMON_F_INPUT,
647
+			   HWMON_F_INPUT,
648
+			   HWMON_F_INPUT,
649
+			   HWMON_F_INPUT,
650
+			   HWMON_F_INPUT,
651
+			   HWMON_F_INPUT,
652
+			   HWMON_F_INPUT,
653
+			   HWMON_F_INPUT,
654
+			   HWMON_F_INPUT,
655
+			   HWMON_F_INPUT,
656
+			   HWMON_F_INPUT,
657
+			   HWMON_F_INPUT,
658
+			   HWMON_F_INPUT),
677
659
 	NULL
678
660
 };
679
661
 
..
..
@@ -861,13 +843,11 @@
861
843
 		dev_err(dev, "Property 'cooling-levels' cannot be read.\n");
862
844
 		return ret;
863
845
 	}
864
-	snprintf(cdev->name, THERMAL_NAME_LENGTH, "%s%d", child->name,
846
+	snprintf(cdev->name, THERMAL_NAME_LENGTH, "%pOFn%d", child,
865
847
 		 pwm_port);
866
848
 
867
-	cdev->tcdev = thermal_of_cooling_device_register(child,
868
-							 cdev->name,
869
-							 cdev,
870
-							 &npcm7xx_pwm_cool_ops);
849
+	cdev->tcdev = devm_thermal_of_cooling_device_register(dev, child,
850
+				cdev->name, cdev, &npcm7xx_pwm_cool_ops);
871
851
 	if (IS_ERR(cdev->tcdev))
872
852
 		return PTR_ERR(cdev->tcdev);
873
853
 
..
..
@@ -987,10 +967,8 @@
987
967
 		spin_lock_init(&data->fan_lock[i]);
988
968
 
989
969
 		data->fan_irq[i] = platform_get_irq(pdev, i);
990
-		if (data->fan_irq[i] < 0) {
991
-			dev_err(dev, "get IRQ fan%d failed\n", i);
970
+		if (data->fan_irq[i] < 0)
992
971
 			return data->fan_irq[i];
993
-		}
994
972
 
995
973
 		sprintf(name, "NPCM7XX-FAN-MD%d", i);
996
974
 		ret = devm_request_irq(dev, data->fan_irq[i], npcm7xx_fan_isr,