Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdeb9b01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 40689ac4 f82735d5

arch/m68k/amiga/platform.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -56,10 +56,7 @@ static int __init amiga_init_bus(void) 
	n = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;

	n = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;

	pdev = platform_device_register_simple("amiga-zorro", -1,

	pdev = platform_device_register_simple("amiga-zorro", -1,

					       zorro_resources, n);

					       zorro_resources, n);

	if (IS_ERR(pdev))

	return PTR_RET(pdev);

		return PTR_ERR(pdev);



	return 0;

}

}





subsys_initcall(amiga_init_bus);

subsys_initcall(amiga_init_bus);

arch/m68k/include/asm/apollohw.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -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 {

struct mc146818 {

        unsigned char second, alarm_second;

        unsigned char second, alarm_second;

        unsigned char minute, alarm_minute;

        unsigned char minute, alarm_minute;

arch/m68k/kernel/time.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -100,10 +100,7 @@ static int __init rtc_init(void) 
		return -ENODEV;

		return -ENODEV;





	pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);

	pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);

	if (IS_ERR(pdev))

	return PTR_RET(pdev);

		return PTR_ERR(pdev);



	return 0;

}

}





module_init(rtc_init);

module_init(rtc_init);

arch/m68k/q40/config.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(void) 
		return -ENODEV;

		return -ENODEV;





	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);

	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);

	if (IS_ERR(pdev))

	return PTR_RET(pdev);

		return PTR_ERR(pdev);



	return 0;

}

}

arch_initcall(q40_add_kbd_device);
 
arch_initcall(q40_add_kbd_device);