The struct sm750_share represents the device state and name sm750_dev
seems more appropriate.
Signed-off-by: Mike Rapoport <mike.rapop...@gmail.com>
---
drivers/staging/sm750fb/sm750.c | 16 ++++++++--------
drivers/staging/sm750fb/sm750.h | 4 ++--
drivers/staging/sm750fb/sm750_hw.c | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 6b2c4da..4c689e0 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -650,14 +650,14 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
{
int ret;
struct lynx_share *share;
- struct sm750_share *spec_share;
+ struct sm750_dev *spec_share;
struct lynxfb_output *output;
struct lynxfb_crtc *crtc;
ret = 0;
share = par->share;
- spec_share = container_of(share, struct sm750_share, share);
+ spec_share = container_of(share, struct sm750_dev, share);
output = &par->output;
crtc = &par->crtc;
@@ -937,14 +937,14 @@ exit:
/* chip specific g_option configuration routine */
static void sm750fb_setup(struct lynx_share *share, char *src)
{
- struct sm750_share *spec_share;
+ struct sm750_dev *spec_share;
char *opt;
#ifdef CAP_EXPENSION
char *exp_res;
#endif
int swap;
- spec_share = container_of(share, struct sm750_share, share);
+ spec_share = container_of(share, struct sm750_dev, share);
#ifdef CAP_EXPENSIION
exp_res = NULL;
#endif
@@ -1037,7 +1037,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
struct fb_info *info[] = {NULL, NULL};
struct lynx_share *share = NULL;
- struct sm750_share *spec_share = NULL;
+ struct sm750_dev *spec_share = NULL;
size_t spec_offset = 0;
int fbidx;
@@ -1048,10 +1048,10 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
}
/*
- * though offset of share in sm750_share is 0,
+ * though offset of share in sm750_dev is 0,
* we use this marcro as the same
*/
- spec_offset = offsetof(struct sm750_share, share);
+ spec_offset = offsetof(struct sm750_dev, share);
spec_share = kzalloc(sizeof(*spec_share), GFP_KERNEL);
if (!spec_share) {
@@ -1202,7 +1202,7 @@ static void lynxfb_pci_remove(struct pci_dev *pdev)
iounmap(share->pvReg);
iounmap(share->pvMem);
- spec_share = container_of(share, struct sm750_share, share);
+ spec_share = container_of(share, struct sm750_dev, share);
kfree(g_settings);
kfree(spec_share);
pci_set_drvdata(pdev, NULL);
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index d50ef21..dd175be 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -108,10 +108,10 @@ struct lynx_share {
};
/*
- * sm750_share stands for a presentation of two frame buffer
+ * sm750_dev stands for a presentation of two frame buffer
* that use one sm750 adaptor
*/
-struct sm750_share {
+struct sm750_dev {
struct lynx_share share;
struct sm750_state state;
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index d5a9f48..ae375f9 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -27,10 +27,10 @@
int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
{
int ret;
- struct sm750_share *spec_share;
+ struct sm750_dev *spec_share;
- spec_share = container_of(share, struct sm750_share, share);
+ spec_share = container_of(share, struct sm750_dev, share);
ret = 0;
share->vidreg_start = pci_resource_start(pdev, 1);
@@ -93,10 +93,10 @@ exit:
int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
{
- struct sm750_share *spec_share;
+ struct sm750_dev *spec_share;
struct init_status *parm;
- spec_share = container_of(share, struct sm750_share, share);
+ spec_share = container_of(share, struct sm750_dev, share);
parm = &spec_share->state.initParm;
if (parm->chip_clk == 0)
parm->chip_clk = (getChipType() == SM750LE) ?
--
2.1.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
