Skip to content

Commit 06dc10e

Browse files
committed
Merge tag 'fbdev-for-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev fixes and cleanups from Helge Deller: "Various minor fixes, cleanups and annotations for atyfb, sa1100fb, omapfb, uvesafb and mmp" * tag 'fbdev-for-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: fbdev: core: syscopyarea: fix sloppy typing fbdev: core: cfbcopyarea: fix sloppy typing fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() fbdev: uvesafb: Remove uvesafb_exec() prototype from include/video/uvesafb.h fbdev: sa1100fb: mark sa1100fb_init() static fbdev: omapfb: fix some error codes fbdev: atyfb: only use ioremap_uc() on i386 and ia64 fbdev: mmp: Annotate struct mmp_path with __counted_by fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by
2 parents 213f891 + e8e4a47 commit 06dc10e

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
lines changed

drivers/video/fbdev/aty/atyfb_base.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3440,11 +3440,15 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info,
34403440
}
34413441

34423442
info->fix.mmio_start = raddr;
3443+
#if defined(__i386__) || defined(__ia64__)
34433444
/*
34443445
* By using strong UC we force the MTRR to never have an
34453446
* effect on the MMIO region on both non-PAT and PAT systems.
34463447
*/
34473448
par->ati_regbase = ioremap_uc(info->fix.mmio_start, 0x1000);
3449+
#else
3450+
par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000);
3451+
#endif
34483452
if (par->ati_regbase == NULL)
34493453
return -ENOMEM;
34503454

drivers/video/fbdev/core/cfbcopyarea.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ void cfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
382382
{
383383
u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;
384384
u32 height = area->height, width = area->width;
385-
unsigned long const bits_per_line = p->fix.line_length*8u;
385+
unsigned int const bits_per_line = p->fix.line_length * 8u;
386386
unsigned long __iomem *base = NULL;
387387
int bits = BITS_PER_LONG, bytes = bits >> 3;
388388
unsigned dst_idx = 0, src_idx = 0, rev_copy = 0;

drivers/video/fbdev/core/syscopyarea.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
316316
{
317317
u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;
318318
u32 height = area->height, width = area->width;
319-
unsigned long const bits_per_line = p->fix.line_length*8u;
319+
unsigned int const bits_per_line = p->fix.line_length * 8u;
320320
unsigned long *base = NULL;
321321
int bits = BITS_PER_LONG, bytes = bits >> 3;
322322
unsigned dst_idx = 0, src_idx = 0, rev_copy = 0;

drivers/video/fbdev/mmp/hw/mmp_ctrl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,7 @@ struct mmphw_ctrl {
14061406

14071407
/*pathes*/
14081408
int path_num;
1409-
struct mmphw_path_plat path_plats[];
1409+
struct mmphw_path_plat path_plats[] __counted_by(path_num);
14101410
};
14111411

14121412
static inline int overlay_is_vid(struct mmp_overlay *overlay)

drivers/video/fbdev/omap/omapfb_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,13 +1645,13 @@ static int omapfb_do_probe(struct platform_device *pdev,
16451645
}
16461646
fbdev->int_irq = platform_get_irq(pdev, 0);
16471647
if (fbdev->int_irq < 0) {
1648-
r = ENXIO;
1648+
r = -ENXIO;
16491649
goto cleanup;
16501650
}
16511651

16521652
fbdev->ext_irq = platform_get_irq(pdev, 1);
16531653
if (fbdev->ext_irq < 0) {
1654-
r = ENXIO;
1654+
r = -ENXIO;
16551655
goto cleanup;
16561656
}
16571657

drivers/video/fbdev/sa1100fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ static struct platform_driver sa1100fb_driver = {
12141214
},
12151215
};
12161216

1217-
int __init sa1100fb_init(void)
1217+
static int __init sa1100fb_init(void)
12181218
{
12191219
if (fb_get_options("sa1100fb", NULL))
12201220
return -ENODEV;

drivers/video/fbdev/uvesafb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1928,10 +1928,10 @@ static void uvesafb_exit(void)
19281928
}
19291929
}
19301930

1931-
cn_del_callback(&uvesafb_cn_id);
19321931
driver_remove_file(&uvesafb_driver.driver, &driver_attr_v86d);
19331932
platform_device_unregister(uvesafb_device);
19341933
platform_driver_unregister(&uvesafb_driver);
1934+
cn_del_callback(&uvesafb_cn_id);
19351935
}
19361936

19371937
module_exit(uvesafb_exit);

include/video/mmp_disp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ struct mmp_path {
231231

232232
/* layers */
233233
int overlay_num;
234-
struct mmp_overlay overlays[];
234+
struct mmp_overlay overlays[] __counted_by(overlay_num);
235235
};
236236

237237
extern struct mmp_path *mmp_get_path(const char *name);

include/video/uvesafb.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ struct uvesafb_ktask {
109109
u32 ack;
110110
};
111111

112-
static int uvesafb_exec(struct uvesafb_ktask *tsk);
113-
114112
#define UVESAFB_EXACT_RES 1
115113
#define UVESAFB_EXACT_DEPTH 2
116114

0 commit comments

Comments
 (0)