mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/9] efi: add and use new efi_device_has_guid helper
Date: Wed,  4 Dec 2019 13:56:51 +0100	[thread overview]
Message-ID: <20191204125659.22506-2-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20191204125659.22506-1-a.fatoum@pengutronix.de>

We have at least two places where we check if a efidev has a particular
guid and a follow-up commit will introduce a third place.

So lets factor it out into a helper.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/block/efi-block-io.c | 11 ++---------
 drivers/efi/efi-device.c     | 11 ++---------
 include/efi/efi-device.h     | 12 ++++++++++++
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c
index 39dbfb0f7ada..30db486876a8 100644
--- a/drivers/block/efi-block-io.c
+++ b/drivers/block/efi-block-io.c
@@ -131,16 +131,9 @@ static void efi_bio_print_info(struct efi_bio_priv *priv)
 			media->optimal_transfer_length_granularity);
 }
 
-static int is_bio_usbdev(struct efi_device *efidev)
+static bool is_bio_usbdev(struct efi_device *efidev)
 {
-	int i;
-
-	for (i = 0; i < efidev->num_guids; i++) {
-		if (!efi_guidcmp(efidev->guids[i], EFI_USB_IO_PROTOCOL_GUID))
-			return 1;
-	}
-
-	return 0;
+	return efi_device_has_guid(efidev, EFI_USB_IO_PROTOCOL_GUID);
 }
 
 static int efi_bio_probe(struct efi_device *efidev)
diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c
index a1aac2dd31be..ac035dcfacbb 100644
--- a/drivers/efi/efi-device.c
+++ b/drivers/efi/efi-device.c
@@ -386,16 +386,9 @@ static int efi_is_setup_mode(void)
 	return ret != 1;
 }
 
-static int is_bio_usbdev(struct efi_device *efidev)
+static bool is_bio_usbdev(struct efi_device *efidev)
 {
-	int i;
-
-	for (i = 0; i < efidev->num_guids; i++) {
-		if (!efi_guidcmp(efidev->guids[i], EFI_USB_IO_PROTOCOL_GUID))
-			return 1;
-	}
-
-	return 0;
+	return efi_device_has_guid(efidev, EFI_USB_IO_PROTOCOL_GUID);
 }
 
 static struct efi_device *bootdev;
diff --git a/include/efi/efi-device.h b/include/efi/efi-device.h
index 5eaf1f260d56..5ec59a8a2ddd 100644
--- a/include/efi/efi-device.h
+++ b/include/efi/efi-device.h
@@ -45,4 +45,16 @@ int efi_connect_all(void);
 void efi_register_devices(void);
 struct efi_device *efi_get_bootsource(void);
 
+static inline bool efi_device_has_guid(struct efi_device *efidev, efi_guid_t guid)
+{
+	int i;
+
+	for (i = 0; i < efidev->num_guids; i++) {
+		if (!efi_guidcmp(efidev->guids[i], guid))
+			return true;
+	}
+
+	return false;
+}
+
 #endif /* __EFI_EFI_DEVICE_H */
-- 
2.24.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2019-12-04 12:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04 12:56 [PATCH 0/9] efi: add PCI controller driver Ahmad Fatoum
2019-12-04 12:56 ` Ahmad Fatoum [this message]
2019-12-04 12:56 ` [PATCH 2/9] driver: add missing parentheses around macro argument Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 3/9] efi: fix off-by-one in mem_malloc_init(..., end) Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 4/9] x86: efi: lds: don't discard any relocation sections Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 5/9] PCI: add driver_data member to struct pci_device_id Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 6/9] PCI: copy over some Linux PCI helpers Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 7/9] efi: turn set of defines into enumerations Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 8/9] pci: add EFI PCI root bridge IO protocol driver Ahmad Fatoum
2019-12-09 10:39   ` Ahmad Fatoum
2019-12-04 12:56 ` [PATCH 9/9] serial: add support for PCI NS16550 UARTs Ahmad Fatoum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191204125659.22506-2-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox