diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-20 09:36:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-20 09:36:57 +1000 |
| commit | 09b0978acb5003702b703141b669fbb46b7c850f (patch) | |
| tree | 17d7d61a1b864875a533e923cf391dea6fb8a18f /include | |
| parent | c7c44009d6c64843950c0bc740974b0a6fe33f8b (diff) | |
| parent | 278811d5a7b2af4e737c88ab3137d3ccc0732ac1 (diff) | |
Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/hyperbus.h | 4 | ||||
| -rw-r--r-- | include/uapi/mtd/mtd-abi.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/mtd/hyperbus.h b/include/linux/mtd/hyperbus.h index 0ce612428aea..bb6b7121a542 100644 --- a/include/linux/mtd/hyperbus.h +++ b/include/linux/mtd/hyperbus.h @@ -89,9 +89,7 @@ int hyperbus_register_device(struct hyperbus_device *hbdev); /** * hyperbus_unregister_device - deregister HyperBus slave memory device * @hbdev: hyperbus_device to be unregistered - * - * Return: 0 for success, others for failure. */ -int hyperbus_unregister_device(struct hyperbus_device *hbdev); +void hyperbus_unregister_device(struct hyperbus_device *hbdev); #endif /* __LINUX_MTD_HYPERBUS_H__ */ diff --git a/include/uapi/mtd/mtd-abi.h b/include/uapi/mtd/mtd-abi.h index b869990c2db2..890d9e5b76d7 100644 --- a/include/uapi/mtd/mtd-abi.h +++ b/include/uapi/mtd/mtd-abi.h @@ -69,8 +69,8 @@ enum { * struct mtd_write_req - data structure for requesting a write operation * * @start: start address - * @len: length of data buffer - * @ooblen: length of OOB buffer + * @len: length of data buffer (only lower 32 bits are used) + * @ooblen: length of OOB buffer (only lower 32 bits are used) * @usr_data: user-provided data buffer * @usr_oob: user-provided OOB buffer * @mode: MTD mode (see "MTD operation modes") |