hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:
 "All pretty boring, seems like all of us had better things to do last
  summer..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
  m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
  m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
  m68k/apollo: Remove disabled definitions in apollohw.h
This commit is contained in:
Linus Torvalds 2012-10-01 13:55:51 -07:00
parent 40689ac479 f82735d550
commit cdeb9b0143
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,10 +56,7 @@ static int __init amiga_init_bus(void)
n = 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 PTR_RET(pdev);
}
subsys_initcall(amiga_init_bus);

12
arch/m68k/include/asm/apollohw.h
View File

@ -46,18 +46,6 @@ struct SCN2681 {
};
#if 0
struct mc146818 {
unsigned int second1:4, second2:4, alarm_second1:4, alarm_second2:4,
minute1:4, minute2:4, alarm_minute1:4, alarm_minute2:4;
unsigned int hours1:4, hours2:4, alarm_hours1:4, alarm_hours2:4,
day_of_week1:4, day_of_week2:4, day_of_month1:4, day_of_month2:4;
unsigned int month1:4, month2:4, year1:4, year2:4, :16;
};
#endif
struct mc146818 {
unsigned char second, alarm_second;
unsigned char minute, alarm_minute;

5
arch/m68k/kernel/time.c
View File

@ -100,10 +100,7 @@ static int __init rtc_init(void)
return -ENODEV;
pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
return 0;
return PTR_RET(pdev);
}
module_init(rtc_init);

5
arch/m68k/q40/config.c
View File

@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(void)
return -ENODEV;
pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
return 0;
return PTR_RET(pdev);
}
arch_initcall(q40_add_kbd_device);