Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304492
b: refs/heads/master
c: 86f3125
h: refs/heads/master
v: v3
  • Loading branch information
Javier M. Mellid authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent d754340 commit 8731e77
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 03e7c251533bf45913a73a9cd8f79adc5efe1c30
refs/heads/master: 86f3125b84b1b830c19ec733bcbea927590e635d
44 changes: 8 additions & 36 deletions trunk/drivers/staging/sm7xx/smtcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,19 @@
* Silicon Motion SM7XX frame buffer device
*
* Copyright (C) 2006 Silicon Motion Technology Corp.
* Authors: Ge Wang, gewang@siliconmotion.com
* Boyod boyod.yang@siliconmotion.com.cn
* Authors: Ge Wang, gewang@siliconmotion.com
* Boyod boyod.yang@siliconmotion.com.cn
*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.com
* Author: Wu Zhangjin, wuzhangjin@gmail.com
*
* Copyright (C) 2011 Igalia, S.L.
* Author: Javier M. Mellid <jmunhoz@igalia.com>
* Author: Javier M. Mellid <jmunhoz@igalia.com>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive for
* more details.
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive for
* more details.
*
* Version 0.10.26192.21.01
* - Add PowerPC/Big endian support
* - Verified on 2.6.19.2
* Boyod.yang <boyod.yang@siliconmotion.com.cn>
*
* Version 0.09.2621.00.01
* - Only support Linux Kernel's version 2.6.21
* Boyod.yang <boyod.yang@siliconmotion.com.cn>
*
* Version 0.09
* - Only support Linux Kernel's version 2.6.12
* Boyod.yang <boyod.yang@siliconmotion.com.cn>
*/

#include <linux/io.h>
Expand Down Expand Up @@ -57,12 +45,6 @@ struct screen_info smtc_screen_info;
* Private structure
*/
struct smtcfb_info {
/*
* The following is a pointer to be passed into the
* functions below. The modules outside the main
* voyager.c driver have no knowledge as to what
* is within this structure.
*/
struct fb_info fb;
struct display_switch *dispsw;
struct pci_dev *dev;
Expand Down Expand Up @@ -858,10 +840,6 @@ static int __init sm712vga_setup(char *options)
}
__setup("vga=", sm712vga_setup);

/* Jason (08/13/2009)
* Original init function changed to probe method to be used by pci_drv
* process used to detect chips replaced with kernel process in pci_drv
*/
static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
Expand All @@ -885,9 +863,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,

if (!sfb)
goto failed_free;
/* Jason (08/13/2009)
* Store fb_info to be further used when suspending and resuming
*/

pci_set_drvdata(pdev, sfb);

sm7xx_init_hw();
Expand Down Expand Up @@ -1021,7 +997,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
}


/* Jason (08/11/2009) PCI_DRV wrapper essential structs */
static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
{ PCI_DEVICE(0x126f, 0x710), },
{ PCI_DEVICE(0x126f, 0x712), },
Expand All @@ -1030,9 +1005,6 @@ static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
};


/* Jason (08/14/2009)
* do some clean up when the driver module is removed
*/
static void __devexit smtcfb_pci_remove(struct pci_dev *pdev)
{
struct smtcfb_info *sfb;
Expand Down

0 comments on commit 8731e77

Please sign in to comment.