PCI: Use align and resource helpers, and SZ_* in quirk_s3_64M()

ij-intel · bjorn-helgaas · commit 9d3faf229c06 · 2024-10-10T17:45:34.000-05:00
Use IS_ALIGNED(), resource_size(), and SZ_* defines in quirk_s3_64M(). Link: https://lore.kernel.org/r/20240614100606.15830-4-ilpo.jarvinen@linux.intel.com Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
@@ -12,6 +12,7 @@
  * file, where their drivers can use them.
  */
 
+#include <linux/align.h>
 #include <linux/bitfield.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -604,7 +605,7 @@ static void quirk_s3_64M(struct pci_dev *dev)
 {
 	struct resource *r = &dev->resource[0];
 
-	if ((r->start & 0x3ffffff) || r->end != r->start + 0x3ffffff) {
+	if (!IS_ALIGNED(r->start, SZ_64M) || resource_size(r) != SZ_64M) {
 		r->flags |= IORESOURCE_UNSET;
 		resource_set_range(r, 0, SZ_64M);
 	}

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`* file, where their drivers can use them.`
`13`	`13`	`*/`
`14`	`14`
	`15`	`+#include <linux/align.h>`
`15`	`16`	`#include <linux/bitfield.h>`
`16`	`17`	`#include <linux/types.h>`
`17`	`18`	`#include <linux/kernel.h>`
`@@ -604,7 +605,7 @@ static void quirk_s3_64M(struct pci_dev *dev)`
`604`	`605`	`{`
`605`	`606`	`struct resource *r = &dev->resource[0];`
`606`	`607`
`607`		`- if ((r->start & 0x3ffffff) \|\| r->end != r->start + 0x3ffffff) {`
	`608`	`+ if (!IS_ALIGNED(r->start, SZ_64M) \|\| resource_size(r) != SZ_64M) {`
`608`	`609`	`r->flags \|= IORESOURCE_UNSET;`
`609`	`610`	`resource_set_range(r, 0, SZ_64M);`
`610`	`611`	`}`