diff options
| author | Huang Shijie <b32955@freescale.com> | 2011-01-05 10:29:32 +0800 |
|---|---|---|
| committer | Alan Tull <alan.tull@freescale.com> | 2011-02-03 16:35:36 -0600 |
| commit | 8a892d577347e33ed22d16f268b6fab699a83fff (patch) | |
| tree | 0ceff5c648577bb323ff5e81332206f30da20a16 /drivers/mtd | |
| parent | 3c9544c44b66ca43768a781f49aa28f594d28078 (diff) | |
ENGR00137600-3 GPMI : remove the structure physical_geometry{} for main file
Remove the physical_geometry{} for the main file :
[1] remove the /sys file for physical_geometry{}
[2] use the nand_chip{} to display the `numchips` infomation.
[3] update the copyright.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/gpmi-nfc/gpmi-nfc-main.c | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-main.c b/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-main.c index be9e1a71923c..32bc08160987 100644 --- a/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-main.c +++ b/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-main.c @@ -1,7 +1,7 @@ /* * Freescale GPMI NFC NAND Flash Driver * - * Copyright (C) 2010 Freescale Semiconductor, Inc. + * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. * Copyright (C) 2008 Embedded Alley Solutions, Inc. * * This program is free software; you can redistribute it and/or modify @@ -127,42 +127,9 @@ static ssize_t show_device_numchips(struct device *dev, struct device_attribute *attr, char *buf) { struct gpmi_nfc_data *this = dev_get_drvdata(dev); - struct physical_geometry *physical = &this->physical_geometry; - - return sprintf(buf, "%d\n", physical->chip_count); - -} - -/** - * show_device_physical_geometry() - Shows the physical Flash device geometry. - * - * @dev: The device of interest. - * @attr: The attribute of interest. - * @buf: A buffer that will receive a representation of the attribute. - */ -static ssize_t show_device_physical_geometry(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct gpmi_nfc_data *this = dev_get_drvdata(dev); - struct nand_device_info *info = &this->device_info; - struct physical_geometry *physical = &this->physical_geometry; - - return sprintf(buf, - "Description : %s\n" - "Chip Count : %u\n" - "Chip Size in Bytes : %llu\n" - "Block Size in Bytes : %u\n" - "Page Data Size in Bytes: %u\n" - "Page OOB Size in Bytes : %u\n" - , - info->description, - physical->chip_count, - physical->chip_size_in_bytes, - physical->block_size_in_bytes, - physical->page_data_size_in_bytes, - physical->page_oob_size_in_bytes - ); + struct nand_chip *nand = &this->mil.nand; + return sprintf(buf, "%d\n", nand->numchips); } /** @@ -1124,7 +1091,6 @@ static ssize_t store_device_timing(struct device *dev, static DEVICE_ATTR(report , 0555, show_device_report , 0); static DEVICE_ATTR(numchips , 0444, show_device_numchips , 0); -static DEVICE_ATTR(physical_geometry, 0444, show_device_physical_geometry, 0); static DEVICE_ATTR(nfc_info , 0444, show_device_nfc_info , 0); static DEVICE_ATTR(nfc_geometry , 0444, show_device_nfc_geometry , 0); static DEVICE_ATTR(rom_geometry , 0444, show_device_rom_geometry , 0); @@ -1151,7 +1117,6 @@ static DEVICE_ATTR(timing, 0644, static struct device_attribute *device_attributes[] = { &dev_attr_report, &dev_attr_numchips, - &dev_attr_physical_geometry, &dev_attr_nfc_info, &dev_attr_nfc_geometry, &dev_attr_rom_geometry, |