redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: sm750fb: replace lynx_share with sm750_dev in function calls 

Use sm750_dev rather than lynx_share as parameter for hw_sm750_map,
hw_sm750_inithw and hw_sm750_initAccel functions.

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Mike Rapoport 2015-10-26 09:06:01 +02:00 committed by Greg Kroah-Hartman
parent 142de763c0
commit 700591a9ad
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/sm750fb/sm750.c
View File

@ -444,6 +444,7 @@ static int lynxfb_resume(struct pci_dev *pdev)
{
struct fb_info *info;
struct lynx_share *share;
struct sm750_dev *sm750_dev;
struct lynxfb_par *par;
struct lynxfb_crtc *crtc;
@ -453,6 +454,7 @@ static int lynxfb_resume(struct pci_dev *pdev)
ret = 0;
share = pci_get_drvdata(pdev);
sm750_dev = container_of(share, struct sm750_dev, share);
console_lock();
@ -472,7 +474,7 @@ static int lynxfb_resume(struct pci_dev *pdev)
pci_set_master(pdev);
}
hw_sm750_inithw(share, pdev);
hw_sm750_inithw(sm750_dev, pdev);
info = share->fbinfo[0];
@ -931,16 +933,15 @@ exit:
}
/* chip specific g_option configuration routine */
static void sm750fb_setup(struct lynx_share *share, char *src)
static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
{
struct sm750_dev *sm750_dev;
struct lynx_share *share = &sm750_dev->share;
char *opt;
#ifdef CAP_EXPENSION
char *exp_res;
#endif
int swap;
sm750_dev = container_of(share, struct sm750_dev, share);
#ifdef CAP_EXPENSIION
exp_res = NULL;
#endif
@ -1086,10 +1087,10 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
}
/* call chip specific setup routine */
sm750fb_setup(share, g_settings);
sm750fb_setup(sm750_dev, g_settings);
/* call chip specific mmap routine */
if (hw_sm750_map(share, pdev)) {
if (hw_sm750_map(sm750_dev, pdev)) {
pr_err("Memory map failed\n");
goto err_map;
}
@ -1105,7 +1106,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, share);
/* call chipInit routine */
hw_sm750_inithw(share, pdev);
hw_sm750_inithw(sm750_dev, pdev);
/* allocate frame buffer info structor according to g_dualview */
fbidx = 0;

6
drivers/staging/sm750fb/sm750.h
View File

@ -196,9 +196,9 @@ static inline unsigned long ps_to_hz(unsigned int psvalue)
return (unsigned long)numerator;
}
int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev);
int hw_sm750_inithw(struct lynx_share*, struct pci_dev *);
void hw_sm750_initAccel(struct lynx_share *);
int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev);
int hw_sm750_inithw(struct sm750_dev*, struct pci_dev *);
void hw_sm750_initAccel(struct sm750_dev *);
int hw_sm750_deWait(void);
int hw_sm750le_deWait(void);

16
drivers/staging/sm750fb/sm750_hw.c
View File

@ -24,13 +24,11 @@
#include "ddk750.h"
#include "sm750_accel.h"
int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
{
int ret;
struct sm750_dev *sm750_dev;
struct lynx_share *share = &sm750_dev->share;
sm750_dev = container_of(share, struct sm750_dev, share);
ret = 0;
share->vidreg_start = pci_resource_start(pdev, 1);
@ -91,12 +89,11 @@ exit:
int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
{
struct sm750_dev *sm750_dev;
struct lynx_share *share = &sm750_dev->share;
struct init_status *parm;
sm750_dev = container_of(share, struct sm750_dev, share);
parm = &sm750_dev->initParm;
if (parm->chip_clk == 0)
parm->chip_clk = (getChipType() == SM750LE) ?
@ -175,7 +172,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
/* init 2d engine */
if (!share->accel_off)
hw_sm750_initAccel(share);
hw_sm750_initAccel(sm750_dev);
return 0;
}
@ -464,8 +461,9 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank)
}
void hw_sm750_initAccel(struct lynx_share *share)
void hw_sm750_initAccel(struct sm750_dev *sm750_dev)
{
struct lynx_share *share = &sm750_dev->share;
u32 reg;
enable2DEngine(1);