|
@@ -48,7 +48,7 @@
|
|
|
#undef writel
|
|
|
#define writel(v, r) do { \
|
|
|
printk(KERN_DEBUG "%s: %08x => %p\n", __func__, (unsigned int)v, r); \
|
|
|
- __raw_writel(v, r); } while(0)
|
|
|
+ __raw_writel(v, r); } while (0)
|
|
|
#endif /* FB_S3C_DEBUG_REGWRITE */
|
|
|
|
|
|
/* irq_flags bits */
|
|
@@ -518,7 +518,7 @@ static int s3c_fb_set_par(struct fb_info *info)
|
|
|
|
|
|
data = VIDTCON2_LINEVAL(var->yres - 1) |
|
|
|
VIDTCON2_HOZVAL(var->xres - 1);
|
|
|
- writel(data, regs +sfb->variant.vidtcon + 8 );
|
|
|
+ writel(data, regs + sfb->variant.vidtcon + 8);
|
|
|
}
|
|
|
|
|
|
/* write the buffer address */
|
|
@@ -1304,6 +1304,7 @@ static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
|
|
|
|
|
|
static int __devinit s3c_fb_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
+ const struct platform_device_id *platid;
|
|
|
struct s3c_fb_driverdata *fbdrv;
|
|
|
struct device *dev = &pdev->dev;
|
|
|
struct s3c_fb_platdata *pd;
|
|
@@ -1312,7 +1313,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
|
|
|
int win;
|
|
|
int ret = 0;
|
|
|
|
|
|
- fbdrv = (struct s3c_fb_driverdata *)platform_get_device_id(pdev)->driver_data;
|
|
|
+ platid = platform_get_device_id(pdev);
|
|
|
+ fbdrv = (struct s3c_fb_driverdata *)platid->driver_data;
|
|
|
|
|
|
if (fbdrv->variant.nr_windows > S3C_FB_MAX_WIN) {
|
|
|
dev_err(dev, "too many windows, cannot attach\n");
|