hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: sm7xxfb: rename vars holding device and revision ids 

This patch fixes CamelCase var names in smtcfb_info holding device and
revision identifiers.

Tested with SM712.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Javier M. Mellid 2012-06-27 14:10:14 +02:00 committed by Greg Kroah-Hartman
parent 3ec50be588
commit 7813296d22
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/sm7xxfb/sm7xxfb.c
View File

@ -42,8 +42,9 @@ struct screen_info smtc_screen_info;
struct smtcfb_info { struct smtcfb_info {
struct fb_info fb; struct fb_info fb;
struct pci_dev *pdev; struct pci_dev *pdev;
u16 chip_id;
u8 chip_rev_id;
u16 chipID;
unsigned char __iomem *m_pMMIO; unsigned char __iomem *m_pMMIO;
char __iomem *m_pLFB; char __iomem *m_pLFB;
char *m_pDPR; char *m_pDPR;
@ -53,8 +54,6 @@ struct smtcfb_info {
u_int width; u_int width;
u_int height; u_int height;
u_int hz; u_int hz;
u8 chipRevID;
}; };
struct vesa_mode_table { struct vesa_mode_table {
@ -231,7 +230,7 @@ static void sm712_setpalette(int regno, unsigned red, unsigned green,
static void smtc_set_timing(struct smtcfb_info *sfb) static void smtc_set_timing(struct smtcfb_info *sfb)
{ {
switch (sfb->chipID) { switch (sfb->chip_id) {
case 0x710: case 0x710:
case 0x712: case 0x712:
case 0x720: case 0x720:
@ -812,8 +811,8 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
if (!sfb) if (!sfb)
goto failed_free; goto failed_free;
sfb->chipID = ent->device; sfb->chip_id = ent->device;
sprintf(name, "sm%Xfb", sfb->chipID); sprintf(name, "sm%Xfb", sfb->chip_id);
pci_set_drvdata(pdev, sfb); pci_set_drvdata(pdev, sfb);
@ -837,9 +836,9 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
#endif #endif
/* Map address and memory detection */ /* Map address and memory detection */
pFramebufferPhysical = pci_resource_start(pdev, 0); pFramebufferPhysical = pci_resource_start(pdev, 0);
pci_read_config_byte(pdev, PCI_REVISION_ID, &sfb->chipRevID); pci_read_config_byte(pdev, PCI_REVISION_ID, &sfb->chip_rev_id);
switch (sfb->chipID) { switch (sfb->chip_id) {
case 0x710: case 0x710:
case 0x712: case 0x712:
sfb->fb.fix.mmio_start = pFramebufferPhysical + 0x00400000; sfb->fb.fix.mmio_start = pFramebufferPhysical + 0x00400000;
@ -925,7 +924,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
dev_info(&pdev->dev, dev_info(&pdev->dev,
"Silicon Motion SM%X Rev%X primary display mode %dx%d-%d Init Complete.", "Silicon Motion SM%X Rev%X primary display mode %dx%d-%d Init Complete.",
sfb->chipID, sfb->chipRevID, sfb->fb.var.xres, sfb->chip_id, sfb->chip_rev_id, sfb->fb.var.xres,
sfb->fb.var.yres, sfb->fb.var.bits_per_pixel); sfb->fb.var.yres, sfb->fb.var.bits_per_pixel);
return 0; return 0;
@ -1001,7 +1000,7 @@ static int smtcfb_pci_resume(struct device *device)
/* reinit hardware */ /* reinit hardware */
sm7xx_init_hw(); sm7xx_init_hw();
switch (sfb->chipID) { switch (sfb->chip_id) {
case 0x710: case 0x710:
case 0x712: case 0x712:
/* set MCLK = 14.31818 * (0x16 / 0x2) */ /* set MCLK = 14.31818 * (0x16 / 0x2) */