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

Commit f1ab57e3 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

ssb: trivial: use pflash helper variable 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a5fc6d7

drivers/ssb/driver_mipscore.c

+10 −9
Original line number Diff line number Diff line
@@ -189,13 +189,14 @@ static void ssb_mips_serial_init(struct ssb_mipscore *mcore) 
static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)

{

	struct ssb_bus *bus = mcore->dev->bus;

	struct ssb_pflash *pflash = &mcore->pflash;



	/* When there is no chipcommon on the bus there is 4MB flash */

	if (!ssb_chipco_available(&bus->chipco)) {

		mcore->pflash.present = true;

		mcore->pflash.buswidth = 2;

		mcore->pflash.window = SSB_FLASH1;

		mcore->pflash.window_size = SSB_FLASH1_SZ;

		pflash->present = true;

		pflash->buswidth = 2;

		pflash->window = SSB_FLASH1;

		pflash->window_size = SSB_FLASH1_SZ;

		return;

	}
@@ -208,14 +209,14 @@ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore) 
		break;

	case SSB_CHIPCO_FLASHT_PARA:

		pr_debug("Found parallel flash\n");

		mcore->pflash.present = true;

		mcore->pflash.window = SSB_FLASH2;

		mcore->pflash.window_size = SSB_FLASH2_SZ;

		pflash->present = true;

		pflash->window = SSB_FLASH2;

		pflash->window_size = SSB_FLASH2_SZ;

		if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)

		               & SSB_CHIPCO_CFG_DS16) == 0)

			mcore->pflash.buswidth = 1;

			pflash->buswidth = 1;

		else

			mcore->pflash.buswidth = 2;

			pflash->buswidth = 2;

		break;

	}

}