[PATCH 1/3] fixup! usb: add static inline wrapper for of_usb_get_phy_mode()

[PATCH 1/3] fixup! usb: add static inline wrapper for of_usb_get_phy_mode()

[Ahmad Fatoum]

Other callsites of this function were fixed, but one was missed,
causing CI breakage.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/usb/imx/chipidea-imx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c
index c5e6ce61e957..9597acef4240 100644
--- a/drivers/usb/imx/chipidea-imx.c
+++ b/drivers/usb/imx/chipidea-imx.c
@@ -18,6 +18,7 @@
 #include <linux/usb/fsl_usb2.h>
 #include <linux/err.h>
 #include <linux/phy/phy.h>
+#include <linux/usb/of.h>
 #include <linux/clk.h>
 
 #define MXC_EHCI_PORTSC_MASK ((0xf << 28) | (1 << 25))
-- 
2.39.5

[PATCH 2/3] fixup! ARM: ep93xx: delete unused drivers

[Ahmad Fatoum]

From: Ahmad Fatoum <ahmad@a3f.at>

The only file including this has been removed, so this can go away as
well.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/serial/serial_pl010.h | 80 -----------------------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 drivers/serial/serial_pl010.h

diff --git a/drivers/serial/serial_pl010.h b/drivers/serial/serial_pl010.h
deleted file mode 100644
index ba81a66da03a..000000000000
--- a/drivers/serial/serial_pl010.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2003, 2004 ARM Ltd. */
-/* SPDX-FileCopyrightText: 2010 Matthias Kaehlcke <matthias@kaehlcke.net> */
-
-/* Contributor: Philippe Robin <philippe.robin@arm.com> */
-
-struct hldc_struct {
-	uint32_t ctrl;
-	uint32_t addmtchval;
-	uint32_t addmask;
-	uint32_t rxinfobuf;
-	uint32_t sts;
-};
-
-struct pl010_struct {
-	uint32_t data;
-	union {
-		uint32_t rxsts;
-		uint32_t errclr;
-	};
-	uint32_t linctrlhigh;
-	uint32_t linctrlmid;
-	uint32_t linctrllow;
-	uint32_t ctrl;
-	uint32_t flag;
-	union {
-		uint32_t intid;
-		uint32_t intclr;
-	};
-	uint32_t not_used0[2];
-	uint32_t dmactrl;
-	uint32_t not_used1[53];
-	uint32_t modemctrl;
-	uint32_t modemsts;
-	uint32_t not_used2[65];
-	struct hldc_struct hldc;
-};
-
-#define UART_PL010_RSR_OE	(1 << 3)
-#define UART_PL010_RSR_BE	(1 << 2)
-#define UART_PL010_RSR_PE	(1 << 1)
-#define UART_PL010_RSR_FE	(1 << 0)
-
-#define UART_PL010_FR_TXFE	(1 << 7)
-#define UART_PL010_FR_RXFF	(1 << 6)
-#define UART_PL010_FR_TXFF	(1 << 5)
-#define UART_PL010_FR_RXFE	(1 << 4)
-#define UART_PL010_FR_BUSY	(1 << 3)
-#define UART_PL010_FR_TMSK	(UART_PL010_FR_TXFF + UART_PL010_FR_BUSY)
-
-#define UART_PL010_CR_LPE	(1 << 7)
-#define UART_PL010_CR_RTIE	(1 << 6)
-#define UART_PL010_CR_TIE	(1 << 5)
-#define UART_PL010_CR_RIE	(1 << 4)
-#define UART_PL010_CR_MSIE	(1 << 3)
-#define UART_PL010_CR_IIRLP	(1 << 2)
-#define UART_PL010_CR_SIREN	(1 << 1)
-#define UART_PL010_CR_UARTEN	(1 << 0)
-
-#define UART_PL010_LCRH_WLEN_8	(3 << 5)
-#define UART_PL010_LCRH_WLEN_7	(2 << 5)
-#define UART_PL010_LCRH_WLEN_6	(1 << 5)
-#define UART_PL010_LCRH_WLEN_5	(0 << 5)
-#define UART_PL010_LCRH_FEN	(1 << 4)
-#define UART_PL010_LCRH_STP2	(1 << 3)
-#define UART_PL010_LCRH_EPS	(1 << 2)
-#define UART_PL010_LCRH_PEN	(1 << 1)
-#define UART_PL010_LCRH_BRK	(1 << 0)
-
-#define UART_PL010_BAUD_460800	1
-#define UART_PL010_BAUD_230400	3
-#define UART_PL010_BAUD_115200	7
-#define UART_PL010_BAUD_57600	15
-#define UART_PL010_BAUD_38400	23
-#define UART_PL010_BAUD_19200	47
-#define UART_PL010_BAUD_14400	63
-#define UART_PL010_BAUD_9600	95
-#define UART_PL010_BAUD_4800	191
-#define UART_PL010_BAUD_2400	383
-#define UART_PL010_BAUD_1200	767
-- 
2.39.5

[PATCH 3/3] fixup! fs: replace FILE.size by f_inode.i_size

[Ahmad Fatoum]

This was missed the first time, because it was .size instead of ->size.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 fs/smhfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/smhfs.c b/fs/smhfs.c
index b32f7422ee48..ed98cd247bd8 100644
--- a/fs/smhfs.c
+++ b/fs/smhfs.c
@@ -116,7 +116,7 @@ static int smhfs_stat(struct device __always_unused *dev,
 
 	if (smhfs_open(NULL, &file, filename) == 0) {
 		s->st_mode = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO;
-		s->st_size = file.size;
+		s->st_size = file.f_size;
 	}
 	smhfs_close(NULL, &file);
 
-- 
2.39.5

Re: [PATCH 1/3] fixup! usb: add static inline wrapper for of_usb_get_phy_mode()

[Sascha Hauer]

On Sun, 12 Jan 2025 09:21:11 +0100, Ahmad Fatoum wrote:
> Other callsites of this function were fixed, but one was missed,
> causing CI breakage.
> 
> 

Applied, thanks!

[1/3] fixup! usb: add static inline wrapper for of_usb_get_phy_mode()
      https://git.pengutronix.de/cgit/barebox/commit/?id=93a06b5203f8 (link may not be stable)
[2/3] fixup! ARM: ep93xx: delete unused drivers
      https://git.pengutronix.de/cgit/barebox/commit/?id=d81cc745e2d7 (link may not be stable)
[3/3] fixup! fs: replace FILE.size by f_inode.i_size
      https://git.pengutronix.de/cgit/barebox/commit/?id=87442cab747b (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>