renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

m68k/amiga: Add error checks when registering platform devices

Browse Source 
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2012-01-22 12:44:25 +01:00
parent 943ce30806
commit eeed227966
1 changed files with 90 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
arch/m68k/amiga/platform.c
View File

@ -6,6 +6,7 @@
* for more details. * for more details.
*/ */
#include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/zorro.h> #include <linux/zorro.h>
@ -46,11 +47,18 @@ static const struct resource zorro_resources[] __initconst = {
static int __init amiga_init_bus(void) static int __init amiga_init_bus(void)
{ {
struct platform_device *pdev;
unsigned int n;
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO)) if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
return -ENODEV; return -ENODEV;
platform_device_register_simple("amiga-zorro", -1, zorro_resources, n = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;
AMIGAHW_PRESENT(ZORRO3) ? 4 : 2); pdev = platform_device_register_simple("amiga-zorro", -1,
zorro_resources, n);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
return 0; return 0;
} }
@ -126,70 +134,120 @@ static const struct resource amiga_rtc_resource __initconst = {
static int __init amiga_init_devices(void) static int __init amiga_init_devices(void)
{ {
struct platform_device *pdev; struct platform_device *pdev;
int error;
if (!MACH_IS_AMIGA) if (!MACH_IS_AMIGA)
return -ENODEV; return -ENODEV;
/* video hardware */ /* video hardware */
if (AMIGAHW_PRESENT(AMI_VIDEO)) if (AMIGAHW_PRESENT(AMI_VIDEO)) {
platform_device_register_simple("amiga-video", -1, NULL, 0); pdev = platform_device_register_simple("amiga-video", -1, NULL,
0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
/* sound hardware */ /* sound hardware */
if (AMIGAHW_PRESENT(AMI_AUDIO)) if (AMIGAHW_PRESENT(AMI_AUDIO)) {
platform_device_register_simple("amiga-audio", -1, NULL, 0); pdev = platform_device_register_simple("amiga-audio", -1, NULL,
0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
/* storage interfaces */ /* storage interfaces */
if (AMIGAHW_PRESENT(AMI_FLOPPY)) if (AMIGAHW_PRESENT(AMI_FLOPPY)) {
platform_device_register_simple("amiga-floppy", -1, NULL, 0); pdev = platform_device_register_simple("amiga-floppy", -1,
NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(A3000_SCSI)) if (AMIGAHW_PRESENT(A3000_SCSI)) {
platform_device_register_simple("amiga-a3000-scsi", -1, pdev = platform_device_register_simple("amiga-a3000-scsi", -1,
&a3000_scsi_resource, 1); &a3000_scsi_resource, 1);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(A4000_SCSI)) if (AMIGAHW_PRESENT(A4000_SCSI)) {
platform_device_register_simple("amiga-a4000t-scsi", -1, pdev = platform_device_register_simple("amiga-a4000t-scsi", -1,
&a4000t_scsi_resource, 1); &a4000t_scsi_resource,
1);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(A1200_IDE) || if (AMIGAHW_PRESENT(A1200_IDE) ||
z_dev_present(ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530_SCSI_IDE)) { z_dev_present(ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530_SCSI_IDE)) {
pdev = platform_device_register_simple("amiga-gayle-ide", -1, pdev = platform_device_register_simple("amiga-gayle-ide", -1,
&a1200_ide_resource, 1); &a1200_ide_resource, 1);
platform_device_add_data(pdev, &a1200_ide_pdata, if (IS_ERR(pdev))
sizeof(a1200_ide_pdata)); return PTR_ERR(pdev);
error = platform_device_add_data(pdev, &a1200_ide_pdata,
sizeof(a1200_ide_pdata));
if (error)
return error;
} }
if (AMIGAHW_PRESENT(A4000_IDE)) { if (AMIGAHW_PRESENT(A4000_IDE)) {
pdev = platform_device_register_simple("amiga-gayle-ide", -1, pdev = platform_device_register_simple("amiga-gayle-ide", -1,
&a4000_ide_resource, 1); &a4000_ide_resource, 1);
platform_device_add_data(pdev, &a4000_ide_pdata, if (IS_ERR(pdev))
sizeof(a4000_ide_pdata)); return PTR_ERR(pdev);
error = platform_device_add_data(pdev, &a4000_ide_pdata,
sizeof(a4000_ide_pdata));
if (error)
return error;
} }
/* other I/O hardware */ /* other I/O hardware */
if (AMIGAHW_PRESENT(AMI_KEYBOARD)) if (AMIGAHW_PRESENT(AMI_KEYBOARD)) {
platform_device_register_simple("amiga-keyboard", -1, NULL, 0); pdev = platform_device_register_simple("amiga-keyboard", -1,
NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(AMI_MOUSE)) if (AMIGAHW_PRESENT(AMI_MOUSE)) {
platform_device_register_simple("amiga-mouse", -1, NULL, 0); pdev = platform_device_register_simple("amiga-mouse", -1, NULL,
0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(AMI_SERIAL)) if (AMIGAHW_PRESENT(AMI_SERIAL)) {
platform_device_register_simple("amiga-serial", -1, NULL, 0); pdev = platform_device_register_simple("amiga-serial", -1,
NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(AMI_PARALLEL)) if (AMIGAHW_PRESENT(AMI_PARALLEL)) {
platform_device_register_simple("amiga-parallel", -1, NULL, 0); pdev = platform_device_register_simple("amiga-parallel", -1,
NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
/* real time clocks */ /* real time clocks */
if (AMIGAHW_PRESENT(A2000_CLK)) if (AMIGAHW_PRESENT(A2000_CLK)) {
platform_device_register_simple("rtc-msm6242", -1, pdev = platform_device_register_simple("rtc-msm6242", -1,
&amiga_rtc_resource, 1); &amiga_rtc_resource, 1);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
if (AMIGAHW_PRESENT(A3000_CLK)) if (AMIGAHW_PRESENT(A3000_CLK)) {
platform_device_register_simple("rtc-rp5c01", -1, pdev = platform_device_register_simple("rtc-rp5c01", -1,
&amiga_rtc_resource, 1); &amiga_rtc_resource, 1);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
}
return 0; return 0;
} }