Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6

Browse Source 
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
  agp: fix shadowed variable warning in amd-k7-agp.c
This commit is contained in:
Linus Torvalds 2008-04-26 09:29:36 -07:00
commit d9c04d6784
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/agp/amd-k7-agp.c
View File

@ -436,8 +436,9 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,
system controller may experience noise due to strong drive strengths system controller may experience noise due to strong drive strengths
*/ */
if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_7006) { if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_7006) {
u8 cap_ptr=0;
struct pci_dev *gfxcard=NULL; struct pci_dev *gfxcard=NULL;
cap_ptr = 0;
while (!cap_ptr) { while (!cap_ptr) {
gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard); gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard);
if (!gfxcard) { if (!gfxcard) {

4
drivers/char/agp/frontend.c
View File

@ -967,7 +967,7 @@ int agpioc_chipset_flush_wrap(struct agp_file_private *priv)
return 0; return 0;
} }
static int agp_ioctl(struct inode *inode, struct file *file, static long agp_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct agp_file_private *curr_priv = file->private_data; struct agp_file_private *curr_priv = file->private_data;
@ -1058,7 +1058,7 @@ static const struct file_operations agp_fops =
.llseek = no_llseek, .llseek = no_llseek,
.read = agp_read, .read = agp_read,
.write = agp_write, .write = agp_write,
.ioctl = agp_ioctl, .unlocked_ioctl = agp_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = compat_agp_ioctl, .compat_ioctl = compat_agp_ioctl,
#endif #endif