bcma: drop unneeded fields from bcma_pflash struct

Most of info stored in this struct wasn't really used anywhere as we put
all that data in platform data & resource as well.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index a40a203314db7278a1aaf81149d4463ad6381cc3..20c134c016dc5d9c76392b2ae3887c2ca6729b3a 100644 (file)
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -288,18 +288,15 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
        case BCMA_CC_FLASHT_PARA:
                bcma_debug(bus, "Found parallel flash\n");
                pflash->present = true;
-               pflash->window = BCMA_SOC_FLASH2;
-               pflash->window_size = BCMA_SOC_FLASH2_SZ;
 
                if ((bcma_read32(cc->core, BCMA_CC_FLASH_CFG) &
                     BCMA_CC_FLASH_CFG_DS) == 0)
-                       pflash->buswidth = 1;
+                       bcma_pflash_data.width = 1;
                else
-                       pflash->buswidth = 2;
+                       bcma_pflash_data.width = 2;
 
-               bcma_pflash_data.width = pflash->buswidth;
-               bcma_pflash_resource.start = pflash->window;
-               bcma_pflash_resource.end = pflash->window + pflash->window_size;
+               bcma_pflash_resource.start = BCMA_SOC_FLASH2;
+               bcma_pflash_resource.end = BCMA_SOC_FLASH2 + BCMA_SOC_FLASH2_SZ;
 
                break;
        default:

diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 700d0c6f7480e46f972a7f30756cbb3320f3dd6c..16eaaad9dda543734732cadcedd27226e1d784ac 100644 (file)
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -579,9 +579,6 @@ struct bcma_chipcommon_pmu {
 #ifdef CONFIG_BCMA_DRIVER_MIPS
 struct bcma_pflash {
        bool present;
-       u8 buswidth;
-       u32 window;
-       u32 window_size;
 };
 
 #ifdef CONFIG_BCMA_SFLASH