Commit 4de19940 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix wrong type and statics in amd ide

parent 451181f1
...@@ -82,7 +82,7 @@ static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100" }; ...@@ -82,7 +82,7 @@ static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100" };
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
static long amd_base; static unsigned long amd_base;
static struct pci_dev *bmide_dev; static struct pci_dev *bmide_dev;
extern int (*amd74xx_display_info)(char *, char **, off_t, int); /* ide-proc.c */ extern int (*amd74xx_display_info)(char *, char **, off_t, int); /* ide-proc.c */
...@@ -102,7 +102,7 @@ static int amd74xx_get_info(char *buffer, char **addr, off_t offset, int count) ...@@ -102,7 +102,7 @@ static int amd74xx_get_info(char *buffer, char **addr, off_t offset, int count)
amd_print("----------AMD BusMastering IDE Configuration----------------"); amd_print("----------AMD BusMastering IDE Configuration----------------");
amd_print("Driver Version: 2.8"); amd_print("Driver Version: 2.9");
amd_print("South Bridge: %s", bmide_dev->dev.name); amd_print("South Bridge: %s", bmide_dev->dev.name);
pci_read_config_byte(dev, PCI_REVISION_ID, &t); pci_read_config_byte(dev, PCI_REVISION_ID, &t);
...@@ -284,7 +284,7 @@ static int amd74xx_ide_dma_check(ide_drive_t *drive) ...@@ -284,7 +284,7 @@ static int amd74xx_ide_dma_check(ide_drive_t *drive)
* and initialize its drive independent registers. * and initialize its drive independent registers.
*/ */
unsigned int __init init_chipset_amd74xx(struct pci_dev *dev, const char *name) static unsigned int __init init_chipset_amd74xx(struct pci_dev *dev, const char *name)
{ {
unsigned char t; unsigned char t;
unsigned int u; unsigned int u;
...@@ -378,12 +378,12 @@ unsigned int __init init_chipset_amd74xx(struct pci_dev *dev, const char *name) ...@@ -378,12 +378,12 @@ unsigned int __init init_chipset_amd74xx(struct pci_dev *dev, const char *name)
return 0; return 0;
} }
unsigned int __init ata66_amd74xx(ide_hwif_t *hwif) static unsigned int __init ata66_amd74xx(ide_hwif_t *hwif)
{ {
return ((amd_enabled & amd_80w) >> hwif->channel) & 1; return ((amd_enabled & amd_80w) >> hwif->channel) & 1;
} }
void __init init_hwif_amd74xx(ide_hwif_t *hwif) static void __init init_hwif_amd74xx(ide_hwif_t *hwif)
{ {
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment