openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

- moved platform structure to platform.c 

- fixed an iounmap warning
- export fixup_xx, needed by the module

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Pete Popov 2005-09-15 23:42:27 +00:00 committed by Ralf Baechle
parent 0bf0e3e279
commit efe29c0f34
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/au1000/common/platform.c
View File

@ -209,8 +209,14 @@ static struct platform_device au1200_ide0_device = {
#endif #endif
static struct platform_device au1x00_pcmcia_device = {
.name = "au1x00-pcmcia",
.id = 0,
};
static struct platform_device *au1xxx_platform_devices[] __initdata = { static struct platform_device *au1xxx_platform_devices[] __initdata = {
&au1xxx_usb_ohci_device, &au1xxx_usb_ohci_device,
&au1x00_pcmcia_device,
#ifdef CONFIG_FB_AU1100 #ifdef CONFIG_FB_AU1100
&au1100_lcd_device, &au1100_lcd_device,
#endif #endif

2
arch/mips/au1000/common/setup.c
View File

@ -32,6 +32,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
@ -186,4 +187,5 @@ phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
/* default nop */ /* default nop */
return phys_addr; return phys_addr;
} }
EXPORT_SYMBOL(__fixup_bigphys_addr);
#endif #endif

8
drivers/pcmcia/au1000_generic.c
View File

@ -490,7 +490,7 @@ int au1x00_drv_pcmcia_remove(struct device *dev)
flush_scheduled_work(); flush_scheduled_work();
skt->ops->hw_shutdown(skt); skt->ops->hw_shutdown(skt);
au1x00_pcmcia_config_skt(skt, &dead_socket); au1x00_pcmcia_config_skt(skt, &dead_socket);
iounmap(skt->virt_io); iounmap(skt->virt_io + (u32)mips_io_port_base);
skt->virt_io = NULL; skt->virt_io = NULL;
} }
@ -528,10 +528,6 @@ static struct device_driver au1x00_pcmcia_driver = {
.resume = pcmcia_socket_dev_resume, .resume = pcmcia_socket_dev_resume,
}; };
static struct platform_device au1x00_device = {
.name = "au1x00-pcmcia",
.id = 0,
};
/* au1x00_pcmcia_init() /* au1x00_pcmcia_init()
* *
@ -545,7 +541,6 @@ static int __init au1x00_pcmcia_init(void)
int error = 0; int error = 0;
if ((error = driver_register(&au1x00_pcmcia_driver))) if ((error = driver_register(&au1x00_pcmcia_driver)))
return error; return error;
platform_device_register(&au1x00_device);
return error; return error;
} }
@ -556,7 +551,6 @@ static int __init au1x00_pcmcia_init(void)
static void __exit au1x00_pcmcia_exit(void) static void __exit au1x00_pcmcia_exit(void)
{ {
driver_unregister(&au1x00_pcmcia_driver); driver_unregister(&au1x00_pcmcia_driver);
platform_device_unregister(&au1x00_device);
} }
module_init(au1x00_pcmcia_init); module_init(au1x00_pcmcia_init);