.. | .. |
---|
131 | 131 | switch (bgmac->net_dev->phydev->speed) { |
---|
132 | 132 | default: |
---|
133 | 133 | netdev_err(net_dev, "Unsupported speed. Defaulting to 1000Mb\n"); |
---|
134 | | - /* fall through */ |
---|
| 134 | + fallthrough; |
---|
135 | 135 | case SPEED_1000: |
---|
136 | 136 | val |= NICPM_IOMUX_CTRL_SPD_1000M << NICPM_IOMUX_CTRL_SPD_SHIFT; |
---|
137 | 137 | break; |
---|
.. | .. |
---|
193 | 193 | bgmac->dma_dev = &pdev->dev; |
---|
194 | 194 | |
---|
195 | 195 | mac_addr = of_get_mac_address(np); |
---|
196 | | - if (mac_addr) |
---|
| 196 | + if (!IS_ERR(mac_addr)) |
---|
197 | 197 | ether_addr_copy(bgmac->net_dev->dev_addr, mac_addr); |
---|
198 | 198 | else |
---|
199 | 199 | dev_warn(&pdev->dev, "MAC address not present in device tree\n"); |
---|
200 | 200 | |
---|
201 | 201 | bgmac->irq = platform_get_irq(pdev, 0); |
---|
202 | | - if (bgmac->irq < 0) { |
---|
203 | | - dev_err(&pdev->dev, "Unable to obtain IRQ\n"); |
---|
| 202 | + if (bgmac->irq < 0) |
---|
204 | 203 | return bgmac->irq; |
---|
205 | | - } |
---|
206 | 204 | |
---|
207 | | - regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "amac_base"); |
---|
208 | | - if (!regs) { |
---|
209 | | - dev_err(&pdev->dev, "Unable to obtain base resource\n"); |
---|
210 | | - return -EINVAL; |
---|
211 | | - } |
---|
212 | | - |
---|
213 | | - bgmac->plat.base = devm_ioremap_resource(&pdev->dev, regs); |
---|
| 205 | + bgmac->plat.base = |
---|
| 206 | + devm_platform_ioremap_resource_byname(pdev, "amac_base"); |
---|
214 | 207 | if (IS_ERR(bgmac->plat.base)) |
---|
215 | 208 | return PTR_ERR(bgmac->plat.base); |
---|
216 | 209 | |
---|