diff options
| author | Robin van der Gracht <robin@protonic.nl> | 2022-06-16 15:11:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-17 09:07:57 +0200 |
| commit | deb45848956d317623c9e809504566043e834f4d (patch) | |
| tree | edeff56025c3071b0450289d6ca758e604186467 | |
| parent | 504b92ea16a8f2de3717e18ac184229cb82528f3 (diff) | |
| download | barebox-deb45848956d317623c9e809504566043e834f4d.tar.gz barebox-deb45848956d317623c9e809504566043e834f4d.tar.xz | |
ARM: boards: protonic-imx6: Remove unsused argument from prt_imx6_usb_mount
Removing this unused pointer pointer relieves the caller from freeing the
memory afterwards.
Signed-off-by: Robin van der Gracht <robin@protonic.nl>
Link: https://lore.barebox.org/20220616131114.214628-6-robin@protonic.nl
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/protonic-imx6/board.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c index 604a47ae5b..5e7a75398d 100644 --- a/arch/arm/boards/protonic-imx6/board.c +++ b/arch/arm/boards/protonic-imx6/board.c @@ -248,7 +248,7 @@ static int prt_imx6_read_i2c_mac_serial(struct prt_imx6_priv *priv) return 0; } -static int prt_imx6_usb_mount(struct prt_imx6_priv *priv, char **usbdisk) +static int prt_imx6_usb_mount(struct prt_imx6_priv *priv) { struct device_d *dev = priv->dev; const char *path; @@ -267,8 +267,6 @@ static int prt_imx6_usb_mount(struct prt_imx6_priv *priv, char **usbdisk) ret = mount(path, NULL, "usb", NULL); if (ret) goto exit_usb_mount; - - *usbdisk = strdup("disk0.0"); return 0; } @@ -278,8 +276,6 @@ static int prt_imx6_usb_mount(struct prt_imx6_priv *priv, char **usbdisk) ret = mount(path, NULL, "usb", NULL); if (ret) goto exit_usb_mount; - - *usbdisk = strdup("disk0"); return 0; } @@ -294,7 +290,7 @@ static void prt_imx6_check_usb_boot_do_work(struct work_struct *w) { struct prt_imx6_priv *priv = container_of(w, struct prt_imx6_priv, work); struct device_d *dev = priv->dev; - char *second_word, *bootsrc, *usbdisk; + char *second_word, *bootsrc; char buf[sizeof("vicut1q recovery")] = {}; unsigned int v; ssize_t size; @@ -306,7 +302,7 @@ static void prt_imx6_check_usb_boot_do_work(struct work_struct *w) usb_rescan(); - ret = prt_imx6_usb_mount(priv, &usbdisk); + ret = prt_imx6_usb_mount(priv); if (ret) return; @@ -363,12 +359,10 @@ static void prt_imx6_check_usb_boot_do_work(struct work_struct *w) if (ret) goto exit_usb_boot; - free(usbdisk); return; exit_usb_boot: dev_err(dev, "Failed to run usb boot: %s\n", strerror(-ret)); - free(usbdisk); return; } |