Commit 077a6ccf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k fixes from Geert Uytterhoeven:

 - Warning fixes to mitigate CONFIG_WERROR=y

* tag 'm68k-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: mvme: Remove overdue #warnings in RTC handling
  m68k: Double cast io functions to unsigned long
parents ff1ffd71 a7b68ed1

arch/m68k/include/asm/raw_io.h

+10 −10
Original line number Diff line number Diff line
@@ -17,21 +17,21 @@ 
 * two accesses to memory, which may be undesirable for some devices.

 */

#define in_8(addr) \

    ({ u8 __v = (*(__force volatile u8 *) (addr)); __v; })

    ({ u8 __v = (*(__force volatile u8 *) (unsigned long)(addr)); __v; })

#define in_be16(addr) \

    ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; })

    ({ u16 __v = (*(__force volatile u16 *) (unsigned long)(addr)); __v; })

#define in_be32(addr) \

    ({ u32 __v = (*(__force volatile u32 *) (addr)); __v; })

    ({ u32 __v = (*(__force volatile u32 *) (unsigned long)(addr)); __v; })

#define in_le16(addr) \

    ({ u16 __v = le16_to_cpu(*(__force volatile __le16 *) (addr)); __v; })

    ({ u16 __v = le16_to_cpu(*(__force volatile __le16 *) (unsigned long)(addr)); __v; })

#define in_le32(addr) \

    ({ u32 __v = le32_to_cpu(*(__force volatile __le32 *) (addr)); __v; })

    ({ u32 __v = le32_to_cpu(*(__force volatile __le32 *) (unsigned long)(addr)); __v; })



#define out_8(addr,b) (void)((*(__force volatile u8 *) (addr)) = (b))

#define out_be16(addr,w) (void)((*(__force volatile u16 *) (addr)) = (w))

#define out_be32(addr,l) (void)((*(__force volatile u32 *) (addr)) = (l))

#define out_le16(addr,w) (void)((*(__force volatile __le16 *) (addr)) = cpu_to_le16(w))

#define out_le32(addr,l) (void)((*(__force volatile __le32 *) (addr)) = cpu_to_le32(l))

#define out_8(addr,b) (void)((*(__force volatile u8 *) (unsigned long)(addr)) = (b))

#define out_be16(addr,w) (void)((*(__force volatile u16 *) (unsigned long)(addr)) = (w))

#define out_be32(addr,l) (void)((*(__force volatile u32 *) (unsigned long)(addr)) = (l))

#define out_le16(addr,w) (void)((*(__force volatile __le16 *) (unsigned long)(addr)) = cpu_to_le16(w))

#define out_le32(addr,l) (void)((*(__force volatile __le32 *) (unsigned long)(addr)) = cpu_to_le32(l))



#define raw_inb in_8

#define raw_inw in_be16

arch/m68k/mvme147/config.c

+3 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static int bcd2int (unsigned char b) 


int mvme147_hwclk(int op, struct rtc_time *t)

{

#warning check me!

	if (!op) {

		m147_rtc->ctrl = RTC_READ;

		t->tm_year = bcd2int (m147_rtc->bcd_year);
@@ -183,6 +182,9 @@ int mvme147_hwclk(int op, struct rtc_time *t) 
		m147_rtc->ctrl = 0;

		if (t->tm_year < 70)

			t->tm_year += 100;

	} else {

		/* FIXME Setting the time is not yet supported */

		return -EOPNOTSUPP;

	}

	return 0;

}

arch/m68k/mvme16x/config.c

+3 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ int bcd2int (unsigned char b) 


int mvme16x_hwclk(int op, struct rtc_time *t)

{

#warning check me!

	if (!op) {

		rtc->ctrl = RTC_READ;

		t->tm_year = bcd2int (rtc->bcd_year);
@@ -448,6 +447,9 @@ int mvme16x_hwclk(int op, struct rtc_time *t) 
		rtc->ctrl = 0;

		if (t->tm_year < 70)

			t->tm_year += 100;

	} else {

		/* FIXME Setting the time is not yet supported */

		return -EOPNOTSUPP;

	}

	return 0;

}