.. | .. |
---|
117 | 117 | return 0; |
---|
118 | 118 | } |
---|
119 | 119 | |
---|
120 | | -static struct fb_ops pmagbafb_ops = { |
---|
| 120 | +static const struct fb_ops pmagbafb_ops = { |
---|
121 | 121 | .owner = THIS_MODULE, |
---|
122 | 122 | .fb_setcolreg = pmagbafb_setcolreg, |
---|
123 | 123 | .fb_fillrect = cfb_fillrect, |
---|
.. | .. |
---|
150 | 150 | int err; |
---|
151 | 151 | |
---|
152 | 152 | info = framebuffer_alloc(sizeof(struct pmagbafb_par), dev); |
---|
153 | | - if (!info) { |
---|
154 | | - printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev)); |
---|
| 153 | + if (!info) |
---|
155 | 154 | return -ENOMEM; |
---|
156 | | - } |
---|
157 | 155 | |
---|
158 | 156 | par = info->par; |
---|
159 | 157 | dev_set_drvdata(dev, info); |
---|
.. | .. |
---|
182 | 180 | |
---|
183 | 181 | /* MMIO mapping setup. */ |
---|
184 | 182 | info->fix.mmio_start = start; |
---|
185 | | - par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len); |
---|
| 183 | + par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len); |
---|
186 | 184 | if (!par->mmio) { |
---|
187 | 185 | printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev)); |
---|
188 | 186 | err = -ENOMEM; |
---|
.. | .. |
---|
192 | 190 | |
---|
193 | 191 | /* Frame buffer mapping setup. */ |
---|
194 | 192 | info->fix.smem_start = start + PMAG_BA_FBMEM; |
---|
195 | | - info->screen_base = ioremap_nocache(info->fix.smem_start, |
---|
| 193 | + info->screen_base = ioremap(info->fix.smem_start, |
---|
196 | 194 | info->fix.smem_len); |
---|
197 | 195 | if (!info->screen_base) { |
---|
198 | 196 | printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev)); |
---|