hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/video/fbdev/pxafb.c
....@@ -597,7 +597,7 @@
597597 return 0;
598598 }
599599
600
-static struct fb_ops pxafb_ops = {
600
+static const struct fb_ops pxafb_ops = {
601601 .owner = THIS_MODULE,
602602 .fb_check_var = pxafb_check_var,
603603 .fb_set_par = pxafb_set_par,
....@@ -865,7 +865,7 @@
865865 return 0;
866866 }
867867
868
-static struct fb_ops overlay_fb_ops = {
868
+static const struct fb_ops overlay_fb_ops = {
869869 .owner = THIS_MODULE,
870870 .fb_open = overlayfb_open,
871871 .fb_release = overlayfb_release,
....@@ -1614,7 +1614,7 @@
16141614 */
16151615 if (old_state != C_DISABLE_PM)
16161616 break;
1617
- /* fall through */
1617
+ fallthrough;
16181618
16191619 case C_ENABLE:
16201620 /*
....@@ -1674,24 +1674,6 @@
16741674 fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) |
16751675 LCCR3_PixClkDiv(pcd);
16761676 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 */
16951677 break;
16961678 }
16971679 return 0;
....@@ -2068,7 +2050,7 @@
20682050 #define pxafb_setup_options() (0)
20692051
20702052 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)");
20722054 #endif
20732055
20742056 #else
....@@ -2255,7 +2237,6 @@
22552237 {
22562238 struct pxafb_info *fbi;
22572239 struct pxafb_mach_info *inf, *pdata;
2258
- struct resource *r;
22592240 int i, irq, ret;
22602241
22612242 dev_dbg(&dev->dev, "pxafb_probe\n");
....@@ -2321,17 +2302,10 @@
23212302 fbi->lcd_supply = NULL;
23222303 }
23232304
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);
23322306 if (IS_ERR(fbi->mmio_base)) {
23332307 dev_err(&dev->dev, "failed to get I/O memory\n");
2334
- ret = -EBUSY;
2308
+ ret = PTR_ERR(fbi->mmio_base);
23352309 goto failed;
23362310 }
23372311
....@@ -2400,11 +2374,8 @@
24002374
24012375 #ifdef CONFIG_CPU_FREQ
24022376 fbi->freq_transition.notifier_call = pxafb_freq_transition;
2403
- fbi->freq_policy.notifier_call = pxafb_freq_policy;
24042377 cpufreq_register_notifier(&fbi->freq_transition,
24052378 CPUFREQ_TRANSITION_NOTIFIER);
2406
- cpufreq_register_notifier(&fbi->freq_policy,
2407
- CPUFREQ_POLICY_NOTIFIER);
24082379 #endif
24092380
24102381 /*