Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eaa7649

Browse files
torvaldstorvalds
committedDec 25, 2018
Merge tag 'mtd/for-4.21' of git://git.infradead.org/linux-mtd
Pull mtd updates from Boris Brezillon: "SPI NOR Core changes: - Parse the 4BAIT SFDP section - Add a bunch of SPI NOR entries to the flash_info table - Add the concept of SFDP fixups and use it to fix a bug on MX25L25635F - A bunch of minor cleanups/comestic changes NAND core changes: - kernel-doc miscellaneous fixes. - Third batch of fixes/cleanup to the raw NAND core impacting various controller drivers (ams-delta, marvell, fsmc, denali, tegra, vf610): * Stop to pass mtd_info objects to internal functions * Reorganize code to avoid forward declarations * Drop useless test in nand_legacy_set_defaults() * Move nand_exec_op() to internal.h * Add nand_[de]select_target() helpers * Pass the CS line to be selected in struct nand_operation * Make ->select_chip() optional when ->exec_op() is implemented * Deprecate the ->select_chip() hook * Move the ->exec_op() method to nand_controller_ops * Move ->setup_data_interface() to nand_controller_ops * Deprecate the dummy_controller field * Fix JEDEC detection * Provide a helper for polling GPIO R/B pin Raw NAND chip drivers changes: - Macronix: * Flag 1.8V AC chips with a broken GET_FEATURES(TIMINGS) Raw NAND controllers drivers changes: - Ams-delta: * Fix the error path * SPDX tag added * May be compiled with COMPILE_TEST=y * Conversion to ->exec_op() interface * Drop .IOADDR_R/W use * Use GPIO API for data I/O - Denali: * Remove denali_reset_banks() * Remove ->dev_ready() hook * Include <linux/bits.h> instead of <linux/bitops.h> * Changes to comply with the above fixes/cleanup done in the core. - FSMC: * Add an SPDX tag to replace the license text * Make conversion from chip to fsmc consistent * Fix unchecked return value in fsmc_read_page_hwecc * Changes to comply with the above fixes/cleanup done in the core. - Marvell: * Prevent timeouts on a loaded machine (fix) * Changes to comply with the above fixes/cleanup done in the core. - OMAP2: * Pass the parent of pdev to dma_request_chan() (fix) - R852: * Use generic DMA API - sh_flctl: * Convert to SPDX identifiers - Sunxi: * Write pageprog related opcodes to the right register: WCMD_SET (fix) - Tegra: * Stop implementing ->select_chip() - VF610: * Add an SPDX tag to replace the license text * Changes to comply with the above fixes/cleanup done in the core. - Various trivial/spelling/coding style fixes. SPI-NAND drivers changes: - Remove the depreacated mt29f_spinand driver from staging. - Add support for: * Toshiba TC58CVG2S0H * GigaDevice GD5FxGQ4xA * Winbond W25N01GV JFFS2 changes: - Fix a lockdep issue MTD changes: - Rework the physmap driver to merge gpio-addr-flash and physmap_of in it - Add a new compatible for RedBoot partitions - Make sub-partitions RW if the parent partition was RO because of a mis-alignment - Add pinctrl support to the - Addition of /* fall-through */ comments where appropriate - Various minor fixes and cleanups Other changes: - Update my email address" * tag 'mtd/for-4.21' of git://git.infradead.org/linux-mtd: (108 commits) mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET MAINTAINERS: Update my email address mtd: rawnand: marvell: prevent timeouts on a loaded machine mtd: rawnand: omap2: Pass the parent of pdev to dma_request_chan() mtd: rawnand: Fix JEDEC detection mtd: spi-nor: Add support for is25lp016d mtd: spi-nor: parse SFDP 4-byte Address Instruction Table mtd: spi-nor: Add 4B_OPCODES flag to is25lp256 mtd: spi-nor: Add an SPDX tag to spi-nor.{c,h} mtd: spi-nor: Make the enable argument passed to set_byte() a bool mtd: spi-nor: Stop passing flash_info around mtd: spi-nor: Avoid forward declaration of internal functions mtd: spi-nor: Drop inline on all internal helpers mtd: spi-nor: Add a post BFPT fixup for MX25L25635E mtd: spi-nor: Add a post BFPT parsing fixup hook mtd: spi-nor: Add the SNOR_F_4B_OPCODES flag mtd: spi-nor: cast to u64 to avoid uint overflows mtd: spi-nor: Add support for IS25LP032/064 mtd: spi-nor: add entry for mt35xu512aba flash mtd: spi-nor: add macros related to MICRON flash ...
2 parents b3cc2bf + f366d38 commit eaa7649

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3542
-4348
lines changed
 

‎drivers/mtd/devices/docg3.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ static void doc_unregister_sysfs(struct platform_device *pdev,
16031603
/*
16041604
* Debug sysfs entries
16051605
*/
1606-
static int dbg_flashctrl_show(struct seq_file *s, void *p)
1606+
static int flashcontrol_show(struct seq_file *s, void *p)
16071607
{
16081608
struct docg3 *docg3 = (struct docg3 *)s->private;
16091609

@@ -1623,9 +1623,9 @@ static int dbg_flashctrl_show(struct seq_file *s, void *p)
16231623

16241624
return 0;
16251625
}
1626-
DEBUGFS_RO_ATTR(flashcontrol, dbg_flashctrl_show);
1626+
DEFINE_SHOW_ATTRIBUTE(flashcontrol);
16271627

1628-
static int dbg_asicmode_show(struct seq_file *s, void *p)
1628+
static int asic_mode_show(struct seq_file *s, void *p)
16291629
{
16301630
struct docg3 *docg3 = (struct docg3 *)s->private;
16311631

@@ -1660,9 +1660,9 @@ static int dbg_asicmode_show(struct seq_file *s, void *p)
16601660
seq_puts(s, ")\n");
16611661
return 0;
16621662
}
1663-
DEBUGFS_RO_ATTR(asic_mode, dbg_asicmode_show);
1663+
DEFINE_SHOW_ATTRIBUTE(asic_mode);
16641664

1665-
static int dbg_device_id_show(struct seq_file *s, void *p)
1665+
static int device_id_show(struct seq_file *s, void *p)
16661666
{
16671667
struct docg3 *docg3 = (struct docg3 *)s->private;
16681668
int id;
@@ -1674,9 +1674,9 @@ static int dbg_device_id_show(struct seq_file *s, void *p)
16741674
seq_printf(s, "DeviceId = %d\n", id);
16751675
return 0;
16761676
}
1677-
DEBUGFS_RO_ATTR(device_id, dbg_device_id_show);
1677+
DEFINE_SHOW_ATTRIBUTE(device_id);
16781678

1679-
static int dbg_protection_show(struct seq_file *s, void *p)
1679+
static int protection_show(struct seq_file *s, void *p)
16801680
{
16811681
struct docg3 *docg3 = (struct docg3 *)s->private;
16821682
int protect, dps0, dps0_low, dps0_high, dps1, dps1_low, dps1_high;
@@ -1726,7 +1726,7 @@ static int dbg_protection_show(struct seq_file *s, void *p)
17261726
!!(dps1 & DOC_DPS_KEY_OK));
17271727
return 0;
17281728
}
1729-
DEBUGFS_RO_ATTR(protection, dbg_protection_show);
1729+
DEFINE_SHOW_ATTRIBUTE(protection);
17301730

17311731
static void __init doc_dbg_register(struct mtd_info *floor)
17321732
{

‎drivers/mtd/devices/docg3.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,6 @@ struct docg3 {
317317
#define doc_info(fmt, arg...) dev_info(docg3->dev, (fmt), ## arg)
318318
#define doc_dbg(fmt, arg...) dev_dbg(docg3->dev, (fmt), ## arg)
319319
#define doc_vdbg(fmt, arg...) dev_vdbg(docg3->dev, (fmt), ## arg)
320-
321-
#define DEBUGFS_RO_ATTR(name, show_fct) \
322-
static int name##_open(struct inode *inode, struct file *file) \
323-
{ return single_open(file, show_fct, inode->i_private); } \
324-
static const struct file_operations name##_fops = { \
325-
.owner = THIS_MODULE, \
326-
.open = name##_open, \
327-
.llseek = seq_lseek, \
328-
.read = seq_read, \
329-
.release = single_release \
330-
};
331320
#endif
332321

333322
/*
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.