projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: fix printk() levels in ide_dump_ata[pi]_error()
[cascardo/linux.git]
/
drivers
/
video
/
gxt4500.c
diff --git
a/drivers/video/gxt4500.c
b/drivers/video/gxt4500.c
index
e92337b
..
896e53d
100644
(file)
--- a/
drivers/video/gxt4500.c
+++ b/
drivers/video/gxt4500.c
@@
-238,7
+238,7
@@
static int calc_pll(int period_ps, struct gxt4500_par *par)
for (pdiv1 = 1; pdiv1 <= 8; ++pdiv1) {
for (pdiv2 = 1; pdiv2 <= pdiv1; ++pdiv2) {
postdiv = pdiv1 * pdiv2;
for (pdiv1 = 1; pdiv1 <= 8; ++pdiv1) {
for (pdiv2 = 1; pdiv2 <= pdiv1; ++pdiv2) {
postdiv = pdiv1 * pdiv2;
- pll_period =
(period_ps + postdiv - 1) / postdiv
;
+ pll_period =
DIV_ROUND_UP(period_ps, postdiv)
;
/* keep pll in range 350..600 MHz */
if (pll_period < 1666 || pll_period > 2857)
continue;
/* keep pll in range 350..600 MHz */
if (pll_period < 1666 || pll_period > 2857)
continue;
@@
-648,7
+648,7
@@
static int __devinit gxt4500_probe(struct pci_dev *pdev,
info->pseudo_palette = par->pseudo_palette;
info->fix.mmio_start = reg_phys;
info->pseudo_palette = par->pseudo_palette;
info->fix.mmio_start = reg_phys;
- par->regs =
ioremap(reg_phys, pci_resource_len(pdev, 0)
);
+ par->regs =
pci_ioremap_bar(pdev, 0
);
if (!par->regs) {
dev_err(&pdev->dev, "gxt4500: cannot map registers\n");
goto err_free_all;
if (!par->regs) {
dev_err(&pdev->dev, "gxt4500: cannot map registers\n");
goto err_free_all;
@@
-656,7
+656,7
@@
static int __devinit gxt4500_probe(struct pci_dev *pdev,
info->fix.smem_start = fb_phys;
info->fix.smem_len = pci_resource_len(pdev, 1);
info->fix.smem_start = fb_phys;
info->fix.smem_len = pci_resource_len(pdev, 1);
- info->screen_base =
ioremap(fb_phys, pci_resource_len(pdev, 1)
);
+ info->screen_base =
pci_ioremap_bar(pdev, 1
);
if (!info->screen_base) {
dev_err(&pdev->dev, "gxt4500: cannot map framebuffer\n");
goto err_unmap_regs;
if (!info->screen_base) {
dev_err(&pdev->dev, "gxt4500: cannot map framebuffer\n");
goto err_unmap_regs;