Skip to content

Commit eec4ed3

Browse files
torvaldstorvalds
committed
Merge tag 'fbdev-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller: "Here's a fix for the smscufx USB graphics card to prevent a kernel crash if it's plugged in/out too fast. The other patches are mostly small cleanups, fixes in failure paths and code removal: - fix an use-after-free in smscufx USB graphics driver - add missing pci_disable_device() in tridentfb failure paths - correctly handle irq detection failure in mb862xx driver - fix resume code in omapfb/dss - drop unused code in controlfb, tridentfb, arkfb, imxfb and udlfb - convert uvesafb to use scnprintf() instead of snprintf() - convert gbefb to use dev_groups - add MODULE_DEVICE_TABLE() entry to vga16fb" * tag 'fbdev-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: fbdev: mb862xx: Fix check of return value from irq_of_parse_and_map() fbdev: vga16fb: Add missing MODULE_DEVICE_TABLE() entry fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove fbdev: smscufx: Fix use-after-free in ufx_ops_open() fbdev: gbefb: Convert to use dev_groups fbdev: imxfb: Remove redundant dev_err() call fbdev: omapfb/dss: Use pm_runtime_resume_and_get() instead of pm_runtime_get_sync() fbdev: uvesafb: Convert snprintf to scnprintf fbdev: arkfb: Remove the unused function dac_read_reg() fbdev: tridentfb: Remove the unused function shadowmode_off() fbdev: controlfb: Remove the unused function VAR_MATCH() fbdev: udlfb: Remove redundant initialization to variable identical
2 parents 500b717 + 29926f1 commit eec4ed3

File tree

16 files changed

+41
-71
lines changed

16 files changed

+41
-71
lines changed

‎drivers/video/fbdev/arkfb.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,14 +318,6 @@ struct dac_info
318318
void *data;
319319
};
320320

321-
322-
static inline u8 dac_read_reg(struct dac_info *info, u8 reg)
323-
{
324-
u8 code[2] = {reg, 0};
325-
info->dac_read_regs(info->data, code, 1);
326-
return code[1];
327-
}
328-
329321
static inline void dac_read_regs(struct dac_info *info, u8 *code, int count)
330322
{
331323
info->dac_read_regs(info->data, code, count);

‎drivers/video/fbdev/controlfb.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ static inline int PAR_EQUAL(struct fb_par_control *x, struct fb_par_control *y)
108108
return (!DIRTY(cmode) && !DIRTY(xres) && !DIRTY(yres)
109109
&& !DIRTY(vxres) && !DIRTY(vyres));
110110
}
111-
static inline int VAR_MATCH(struct fb_var_screeninfo *x, struct fb_var_screeninfo *y)
112-
{
113-
return (!DIRTY(bits_per_pixel) && !DIRTY(xres)
114-
&& !DIRTY(yres) && !DIRTY(xres_virtual)
115-
&& !DIRTY(yres_virtual)
116-
&& !DIRTY_CMAP(red) && !DIRTY_CMAP(green) && !DIRTY_CMAP(blue));
117-
}
118111

119112
struct fb_info_control {
120113
struct fb_info info;

‎drivers/video/fbdev/gbefb.c‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,17 +1072,12 @@ static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *at
10721072

10731073
static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL);
10741074

1075-
static void gbefb_remove_sysfs(struct device *dev)
1076-
{
1077-
device_remove_file(dev, &dev_attr_size);
1078-
device_remove_file(dev, &dev_attr_revision);
1079-
}
1080-
1081-
static void gbefb_create_sysfs(struct device *dev)
1082-
{
1083-
device_create_file(dev, &dev_attr_size);
1084-
device_create_file(dev, &dev_attr_revision);
1085-
}
1075+
static struct attribute *gbefb_attrs[] = {
1076+
&dev_attr_size.attr,
1077+
&dev_attr_revision.attr,
1078+
NULL,
1079+
};
1080+
ATTRIBUTE_GROUPS(gbefb);
10861081

10871082
/*
10881083
* Initialization
@@ -1221,7 +1216,6 @@ static int gbefb_probe(struct platform_device *p_dev)
12211216
}
12221217

12231218
platform_set_drvdata(p_dev, info);
1224-
gbefb_create_sysfs(&p_dev->dev);
12251219

12261220
fb_info(info, "%s rev %d @ 0x%08x using %dkB memory\n",
12271221
info->fix.id, gbe_revision, (unsigned)GBE_BASE,
@@ -1248,7 +1242,6 @@ static int gbefb_remove(struct platform_device* p_dev)
12481242
gbe_turn_off();
12491243
arch_phys_wc_del(par->wc_cookie);
12501244
release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
1251-
gbefb_remove_sysfs(&p_dev->dev);
12521245
framebuffer_release(info);
12531246

12541247
return 0;
@@ -1259,6 +1252,7 @@ static struct platform_driver gbefb_driver = {
12591252
.remove = gbefb_remove,
12601253
.driver = {
12611254
.name = "gbefb",
1255+
.dev_groups = gbefb_groups,
12621256
},
12631257
};
12641258

‎drivers/video/fbdev/imxfb.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,6 @@ static int imxfb_probe(struct platform_device *pdev)
972972

973973
fbi->regs = devm_ioremap_resource(&pdev->dev, res);
974974
if (IS_ERR(fbi->regs)) {
975-
dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
976975
ret = PTR_ERR(fbi->regs);
977976
goto failed_ioremap;
978977
}

‎drivers/video/fbdev/mb862xx/mb862xxfbdrv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ static int of_platform_mb862xx_probe(struct platform_device *ofdev)
693693
par->dev = dev;
694694

695695
par->irq = irq_of_parse_and_map(np, 0);
696-
if (par->irq == NO_IRQ) {
696+
if (!par->irq) {
697697
dev_err(dev, "failed to map irq\n");
698698
ret = -ENODEV;
699699
goto fbrel;

‎drivers/video/fbdev/omap2/omapfb/dss/dispc.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,9 @@ int dispc_runtime_get(void)
519519

520520
DSSDBG("dispc_runtime_get\n");
521521

522-
r = pm_runtime_get_sync(&dispc.pdev->dev);
523-
if (WARN_ON(r < 0)) {
524-
pm_runtime_put_sync(&dispc.pdev->dev);
522+
r = pm_runtime_resume_and_get(&dispc.pdev->dev);
523+
if (WARN_ON(r < 0))
525524
return r;
526-
}
527525
return 0;
528526
}
529527
EXPORT_SYMBOL(dispc_runtime_get);

‎drivers/video/fbdev/omap2/omapfb/dss/dsi.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,11 +1136,9 @@ static int dsi_runtime_get(struct platform_device *dsidev)
11361136

11371137
DSSDBG("dsi_runtime_get\n");
11381138

1139-
r = pm_runtime_get_sync(&dsi->pdev->dev);
1140-
if (WARN_ON(r < 0)) {
1141-
pm_runtime_put_sync(&dsi->pdev->dev);
1139+
r = pm_runtime_resume_and_get(&dsi->pdev->dev);
1140+
if (WARN_ON(r < 0))
11421141
return r;
1143-
}
11441142
return 0;
11451143
}
11461144

‎drivers/video/fbdev/omap2/omapfb/dss/dss.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -767,11 +767,9 @@ int dss_runtime_get(void)
767767

768768
DSSDBG("dss_runtime_get\n");
769769

770-
r = pm_runtime_get_sync(&dss.pdev->dev);
771-
if (WARN_ON(r < 0)) {
772-
pm_runtime_put_sync(&dss.pdev->dev);
770+
r = pm_runtime_resume_and_get(&dss.pdev->dev);
771+
if (WARN_ON(r < 0))
773772
return r;
774-
}
775773
return 0;
776774
}
777775

‎drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ static int hdmi_runtime_get(void)
3838

3939
DSSDBG("hdmi_runtime_get\n");
4040

41-
r = pm_runtime_get_sync(&hdmi.pdev->dev);
42-
if (WARN_ON(r < 0)) {
43-
pm_runtime_put_sync(&hdmi.pdev->dev);
41+
r = pm_runtime_resume_and_get(&hdmi.pdev->dev);
42+
if (WARN_ON(r < 0))
4443
return r;
45-
}
4644

4745
return 0;
4846
}

‎drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ static int hdmi_runtime_get(void)
4242

4343
DSSDBG("hdmi_runtime_get\n");
4444

45-
r = pm_runtime_get_sync(&hdmi.pdev->dev);
46-
if (WARN_ON(r < 0)) {
47-
pm_runtime_put_sync(&hdmi.pdev->dev);
45+
r = pm_runtime_resume_and_get(&hdmi.pdev->dev);
46+
if (WARN_ON(r < 0))
4847
return r;
49-
}
5048

5149
return 0;
5250
}

0 commit comments

Comments
 (0)