.. | .. |
---|
186 | 186 | struct device_node *np = dev->of_node; |
---|
187 | 187 | struct device_node *childnp; |
---|
188 | 188 | unsigned long parent_clk_freq; |
---|
189 | | - u32 clk_freq = 100000; |
---|
190 | | - struct resource *r; |
---|
| 189 | + u32 clk_freq = I2C_MAX_STANDARD_MODE_FREQ; |
---|
191 | 190 | struct p2wi *p2wi; |
---|
192 | 191 | u32 slave_addr; |
---|
193 | 192 | int clk_div; |
---|
.. | .. |
---|
231 | 230 | p2wi->slave_addr = slave_addr; |
---|
232 | 231 | } |
---|
233 | 232 | |
---|
234 | | - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
---|
235 | | - p2wi->regs = devm_ioremap_resource(dev, r); |
---|
| 233 | + p2wi->regs = devm_platform_ioremap_resource(pdev, 0); |
---|
236 | 234 | if (IS_ERR(p2wi->regs)) |
---|
237 | 235 | return PTR_ERR(p2wi->regs); |
---|
238 | 236 | |
---|
239 | 237 | strlcpy(p2wi->adapter.name, pdev->name, sizeof(p2wi->adapter.name)); |
---|
240 | 238 | irq = platform_get_irq(pdev, 0); |
---|
241 | | - if (irq < 0) { |
---|
242 | | - dev_err(dev, "failed to retrieve irq: %d\n", irq); |
---|
| 239 | + if (irq < 0) |
---|
243 | 240 | return irq; |
---|
244 | | - } |
---|
245 | 241 | |
---|
246 | 242 | p2wi->clk = devm_clk_get(dev, NULL); |
---|
247 | 243 | if (IS_ERR(p2wi->clk)) { |
---|