.. | .. |
---|
147 | 147 | return 0; |
---|
148 | 148 | } |
---|
149 | 149 | |
---|
150 | | -static struct fb_ops aafb_ops = { |
---|
| 150 | +static const struct fb_ops aafb_ops = { |
---|
151 | 151 | .owner = THIS_MODULE, |
---|
152 | 152 | .fb_blank = aafb_blank, |
---|
153 | 153 | .fb_fillrect = cfb_fillrect, |
---|
.. | .. |
---|
165 | 165 | int err; |
---|
166 | 166 | |
---|
167 | 167 | info = framebuffer_alloc(sizeof(struct aafb_par), dev); |
---|
168 | | - if (!info) { |
---|
169 | | - printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev)); |
---|
| 168 | + if (!info) |
---|
170 | 169 | return -ENOMEM; |
---|
171 | | - } |
---|
172 | 170 | |
---|
173 | 171 | par = info->par; |
---|
174 | 172 | dev_set_drvdata(dev, info); |
---|
.. | .. |
---|
190 | 188 | |
---|
191 | 189 | /* MMIO mapping setup. */ |
---|
192 | 190 | info->fix.mmio_start = start + PMAG_AA_BT455_OFFSET; |
---|
193 | | - par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len); |
---|
| 191 | + par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len); |
---|
194 | 192 | if (!par->mmio) { |
---|
195 | 193 | printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev)); |
---|
196 | 194 | err = -ENOMEM; |
---|
.. | .. |
---|
201 | 199 | |
---|
202 | 200 | /* Frame buffer mapping setup. */ |
---|
203 | 201 | info->fix.smem_start = start + PMAG_AA_ONBOARD_FBMEM_OFFSET; |
---|
204 | | - info->screen_base = ioremap_nocache(info->fix.smem_start, |
---|
| 202 | + info->screen_base = ioremap(info->fix.smem_start, |
---|
205 | 203 | info->fix.smem_len); |
---|
206 | 204 | if (!info->screen_base) { |
---|
207 | 205 | printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev)); |
---|