hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/net/can/ifi_canfd/ifi_canfd.c
....@@ -942,15 +942,16 @@
942942 struct device *dev = &pdev->dev;
943943 struct net_device *ndev;
944944 struct ifi_canfd_priv *priv;
945
- struct resource *res;
946945 void __iomem *addr;
947946 int irq, ret;
948947 u32 id, rev;
949948
950
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
951
- addr = devm_ioremap_resource(dev, res);
949
+ addr = devm_platform_ioremap_resource(pdev, 0);
950
+ if (IS_ERR(addr))
951
+ return PTR_ERR(addr);
952
+
952953 irq = platform_get_irq(pdev, 0);
953
- if (IS_ERR(addr) || irq < 0)
954
+ if (irq < 0)
954955 return -EINVAL;
955956
956957 id = readl(addr + IFI_CANFD_IP_ID);