.. | .. |
---|
597 | 597 | return 0; |
---|
598 | 598 | } |
---|
599 | 599 | |
---|
600 | | -static struct fb_ops pxafb_ops = { |
---|
| 600 | +static const struct fb_ops pxafb_ops = { |
---|
601 | 601 | .owner = THIS_MODULE, |
---|
602 | 602 | .fb_check_var = pxafb_check_var, |
---|
603 | 603 | .fb_set_par = pxafb_set_par, |
---|
.. | .. |
---|
865 | 865 | return 0; |
---|
866 | 866 | } |
---|
867 | 867 | |
---|
868 | | -static struct fb_ops overlay_fb_ops = { |
---|
| 868 | +static const struct fb_ops overlay_fb_ops = { |
---|
869 | 869 | .owner = THIS_MODULE, |
---|
870 | 870 | .fb_open = overlayfb_open, |
---|
871 | 871 | .fb_release = overlayfb_release, |
---|
.. | .. |
---|
1614 | 1614 | */ |
---|
1615 | 1615 | if (old_state != C_DISABLE_PM) |
---|
1616 | 1616 | break; |
---|
1617 | | - /* fall through */ |
---|
| 1617 | + fallthrough; |
---|
1618 | 1618 | |
---|
1619 | 1619 | case C_ENABLE: |
---|
1620 | 1620 | /* |
---|
.. | .. |
---|
1674 | 1674 | fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | |
---|
1675 | 1675 | LCCR3_PixClkDiv(pcd); |
---|
1676 | 1676 | set_ctrlr_state(fbi, C_ENABLE_CLKCHANGE); |
---|
1677 | | - break; |
---|
1678 | | - } |
---|
1679 | | - return 0; |
---|
1680 | | -} |
---|
1681 | | - |
---|
1682 | | -static int |
---|
1683 | | -pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data) |
---|
1684 | | -{ |
---|
1685 | | - struct pxafb_info *fbi = TO_INF(nb, freq_policy); |
---|
1686 | | - struct fb_var_screeninfo *var = &fbi->fb.var; |
---|
1687 | | - struct cpufreq_policy *policy = data; |
---|
1688 | | - |
---|
1689 | | - switch (val) { |
---|
1690 | | - case CPUFREQ_ADJUST: |
---|
1691 | | - pr_debug("min dma period: %d ps, " |
---|
1692 | | - "new clock %d kHz\n", pxafb_display_dma_period(var), |
---|
1693 | | - policy->max); |
---|
1694 | | - /* TODO: fill in min/max values */ |
---|
1695 | 1677 | break; |
---|
1696 | 1678 | } |
---|
1697 | 1679 | return 0; |
---|
.. | .. |
---|
2068 | 2050 | #define pxafb_setup_options() (0) |
---|
2069 | 2051 | |
---|
2070 | 2052 | module_param_string(options, g_options, sizeof(g_options), 0); |
---|
2071 | | -MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)"); |
---|
| 2053 | +MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.rst)"); |
---|
2072 | 2054 | #endif |
---|
2073 | 2055 | |
---|
2074 | 2056 | #else |
---|
.. | .. |
---|
2255 | 2237 | { |
---|
2256 | 2238 | struct pxafb_info *fbi; |
---|
2257 | 2239 | struct pxafb_mach_info *inf, *pdata; |
---|
2258 | | - struct resource *r; |
---|
2259 | 2240 | int i, irq, ret; |
---|
2260 | 2241 | |
---|
2261 | 2242 | dev_dbg(&dev->dev, "pxafb_probe\n"); |
---|
.. | .. |
---|
2321 | 2302 | fbi->lcd_supply = NULL; |
---|
2322 | 2303 | } |
---|
2323 | 2304 | |
---|
2324 | | - r = platform_get_resource(dev, IORESOURCE_MEM, 0); |
---|
2325 | | - if (r == NULL) { |
---|
2326 | | - dev_err(&dev->dev, "no I/O memory resource defined\n"); |
---|
2327 | | - ret = -ENODEV; |
---|
2328 | | - goto failed; |
---|
2329 | | - } |
---|
2330 | | - |
---|
2331 | | - fbi->mmio_base = devm_ioremap_resource(&dev->dev, r); |
---|
| 2305 | + fbi->mmio_base = devm_platform_ioremap_resource(dev, 0); |
---|
2332 | 2306 | if (IS_ERR(fbi->mmio_base)) { |
---|
2333 | 2307 | dev_err(&dev->dev, "failed to get I/O memory\n"); |
---|
2334 | | - ret = -EBUSY; |
---|
| 2308 | + ret = PTR_ERR(fbi->mmio_base); |
---|
2335 | 2309 | goto failed; |
---|
2336 | 2310 | } |
---|
2337 | 2311 | |
---|
.. | .. |
---|
2400 | 2374 | |
---|
2401 | 2375 | #ifdef CONFIG_CPU_FREQ |
---|
2402 | 2376 | fbi->freq_transition.notifier_call = pxafb_freq_transition; |
---|
2403 | | - fbi->freq_policy.notifier_call = pxafb_freq_policy; |
---|
2404 | 2377 | cpufreq_register_notifier(&fbi->freq_transition, |
---|
2405 | 2378 | CPUFREQ_TRANSITION_NOTIFIER); |
---|
2406 | | - cpufreq_register_notifier(&fbi->freq_policy, |
---|
2407 | | - CPUFREQ_POLICY_NOTIFIER); |
---|
2408 | 2379 | #endif |
---|
2409 | 2380 | |
---|
2410 | 2381 | /* |
---|