Merge branch '2023-07-25-assorted-general-updates'

- A number of MAINTAINER file updates, assorted driver/platform fixes,
  performance improvements for sparse file writes, and 64bit time_t.

3 files changed, 3 insertions, 24 deletions

diff --git a/include/image-sparse.h b/include/image-sparse.h
index 0572dbd0a28..282a0b25649 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -7,6 +7,8 @@
 #include <part.h>
 #include <sparse_format.h>
 
+#define FASTBOOT_MAX_BLK_WRITE 16384
+
 #define ROUNDUP(x, y)	(((x) + ((y) - 1)) & ~((y) - 1))
 
 struct sparse_storage {
diff --git a/include/linux/types.h b/include/linux/types.h
index baa2c491ea5..9df930afd13 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -65,7 +65,7 @@ typedef __kernel_ptrdiff_t	ptrdiff_t;
 
 #ifndef _TIME_T
 #define _TIME_T
-typedef __kernel_time_t		time_t;
+typedef long long		time_t;
 #endif
 
 #ifndef _CLOCK_T
diff --git a/include/part.h b/include/part.h
index b19b33ab89a..edc46f8dcbe 100644
--- a/include/part.h
+++ b/include/part.h
@@ -202,21 +202,6 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
 			    struct disk_partition *info, int allow_whole_dev);
 
 /**
- * part_get_info_by_name_type() - Search for a partition by name
- *                                for only specified partition type
- *
- * @param dev_desc - block device descriptor
- * @param gpt_name - the specified table entry name
- * @param info - returns the disk partition info
- * @param part_type - only search in partitions of this type
- *
- * Return: - the partition number on match (starting on 1), -1 on no match,
- * otherwise error
- */
-int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
-			       struct disk_partition *info, int part_type);
-
-/**
  * part_get_info_by_name() - Search for a partition by name
  *                           among all available registered partitions
  *
@@ -293,14 +278,6 @@ static inline int blk_get_device_part_str(const char *ifname,
 					  int allow_whole_dev)
 { *dev_desc = NULL; return -1; }
 
-static inline int part_get_info_by_name_type(struct blk_desc *dev_desc,
-					     const char *name,
-					     struct disk_partition *info,
-					     int part_type)
-{
-	return -ENOENT;
-}
-
 static inline int part_get_info_by_name(struct blk_desc *dev_desc,
 					const char *name,
 					struct disk_partition *info)