Commit 9f5989d7 authored by Helge Deller's avatar Helge Deller
Browse files

parisc/firmware: Use PDC constants for narrow/wide firmware 



PDC uses the PDC_MODEL_OS64 and PDC_MODEL_OS32 constants, so use
those constants for the internal WIDE_FIRMWARE/NARROW_FIRMWARE too.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 06a2e499

arch/parisc/kernel/firmware.c

+7 −7
Original line number Diff line number Diff line
@@ -78,12 +78,12 @@ static unsigned long pdc_result[NUM_PDC_RESULT] __aligned(8); 
static unsigned long pdc_result2[NUM_PDC_RESULT] __aligned(8);



#ifdef CONFIG_64BIT

#define WIDE_FIRMWARE 0x1

#define NARROW_FIRMWARE 0x2

#define WIDE_FIRMWARE		PDC_MODEL_OS64

#define NARROW_FIRMWARE		PDC_MODEL_OS32



/* Firmware needs to be initially set to narrow to determine the

 * actual firmware width. */

int parisc_narrow_firmware __ro_after_init = 2;

int parisc_narrow_firmware __ro_after_init = NARROW_FIRMWARE;

#endif



/* On most currently-supported platforms, IODC I/O calls are 32-bit calls
@@ -178,7 +178,7 @@ void set_firmware_width(void) 
	unsigned long flags;



	/* already initialized? */

	if (parisc_narrow_firmware != 2)

	if (parisc_narrow_firmware != NARROW_FIRMWARE)

		return;



	spin_lock_irqsave(&pdc_lock, flags);