hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/drivers/i2c/busses/i2c-bcm-kona.c
....@@ -722,16 +722,16 @@
722722 }
723723
724724 switch (bus_speed) {
725
- case 100000:
725
+ case I2C_MAX_STANDARD_MODE_FREQ:
726726 dev->std_cfg = &std_cfg_table[BCM_SPD_100K];
727727 break;
728
- case 400000:
728
+ case I2C_MAX_FAST_MODE_FREQ:
729729 dev->std_cfg = &std_cfg_table[BCM_SPD_400K];
730730 break;
731
- case 1000000:
731
+ case I2C_MAX_FAST_MODE_PLUS_FREQ:
732732 dev->std_cfg = &std_cfg_table[BCM_SPD_1MHZ];
733733 break;
734
- case 3400000:
734
+ case I2C_MAX_HIGH_SPEED_MODE_FREQ:
735735 /* Send mastercode at 100k */
736736 dev->std_cfg = &std_cfg_table[BCM_SPD_100K];
737737 dev->hs_cfg = &hs_cfg_table[BCM_SPD_3P4MHZ];
....@@ -750,7 +750,6 @@
750750 int rc = 0;
751751 struct bcm_kona_i2c_dev *dev;
752752 struct i2c_adapter *adap;
753
- struct resource *iomem;
754753
755754 /* Allocate memory for private data structure */
756755 dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
....@@ -762,8 +761,7 @@
762761 init_completion(&dev->done);
763762
764763 /* Map hardware registers */
765
- iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
766
- dev->base = devm_ioremap_resource(dev->device, iomem);
764
+ dev->base = devm_platform_ioremap_resource(pdev, 0);
767765 if (IS_ERR(dev->base))
768766 return -ENOMEM;
769767
....@@ -823,8 +821,7 @@
823821 /* Get the interrupt number */
824822 dev->irq = platform_get_irq(pdev, 0);
825823 if (dev->irq < 0) {
826
- dev_err(dev->device, "no irq resource\n");
827
- rc = -ENODEV;
824
+ rc = dev->irq;
828825 goto probe_disable_clk;
829826 }
830827