mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
standalone cache drivers for v7.4
Three low-priority bugfixes for issues in the hisi hha and sifive ccache drivers as well as the core code. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCas5Q3gAKCRB4tDGHoIJi 0oGjAQDNu65EIEIG0QRSpnL6VaQxzNbZiIqFn7576RRATButXwEAllZD4LS/oKbw Xo+lIakKF81bPDo5xfD5HvDQ8PYJIg8= =8yqa -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmrSVG8ACgkQmmx57+YA GNnZJg/9HD4J9BtF7zdAOmoV8C6VmHbneoM+4uZ7jLj7dmklP0RoXHoK7/hfTMJi 9U0ZM58771oAbH/C1qk2J9PLCaSqclxg/zA4GVi7L8ihHlnqbSyRjhJBYqEEvyJZ nLONg+haYlROMxMBHi03HrDdmQmd93ezBxdsU5xgcC+4REjXuhfu6Rf5XFuaMO6U 3IttfN9xuxDDRRkF+n53bzJMdsp+hgSz9+QgwL8zsLexoxllwSv/dr267ro6/z/6 xvZY6x9N1XE9GqEbX4bmaqz7fY39gRVcXX1Rh+KWGu1lrjqO5T++xc8+oUzE6O8r FRtL3UeImH37kQWXGvoe5l4bfWCb1X3j4A+PFC/7dlCiN8GdMhVHpl3cfg9xSf/D ySnkSpjkkn8fisnAyvtFk0p4U65S1ff0O5aP1xEHD2K3BN8/b/uYazRr4KXm9G+w 7POFCZ2wb9ny2Ego/evbPtcoq8YOpU2BzwqYI3fCTE/VHfYBA5/dbhC84f1vUyib LCGPCCcJJ8NsubPWW5W9SdLjiw/k2pX2FO4Nay7EF1qkvSMsaW9RDfIDH3CM0BRN 72XCIS6T109MKDJtt/q2enYBsuSI42A8WvXugMW5L27ryc+49fZvfT1ZBdQ60RUf SRSfKpqqRfsNZ7hH2jyYtCQC4DHjHjLJOCIzLd4JbRp9HqUdYWY= =B2E0 -----END PGP SIGNATURE----- Merge tag 'cache-for-v7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/drivers standalone cache drivers for v7.4 Three low-priority bugfixes for issues in the hisi hha and sifive ccache drivers as well as the core code. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> * tag 'cache-for-v7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: cache: Make cpu_cache_invalidate_memregion() error out if there are no handlers cache: sifive_ccache: Remove redundant dev_err_probe() cache: hisi_soc_hha: use named initializers for acpi_device_id Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
655e6054ac
2
drivers/cache/hisi_soc_hha.c
vendored
2
drivers/cache/hisi_soc_hha.c
vendored
|
|
@ -170,7 +170,7 @@ static void hisi_soc_hha_remove(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
static const struct acpi_device_id hisi_soc_hha_ids[] = {
|
||||
{ "HISI0511", },
|
||||
{ .id = "HISI0511" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, hisi_soc_hha_ids);
|
||||
|
|
|
|||
2
drivers/cache/sifive_ccache.c
vendored
2
drivers/cache/sifive_ccache.c
vendored
|
|
@ -275,7 +275,7 @@ static int sifive_ccache_probe(struct platform_device *pdev)
|
|||
|
||||
rc = devm_request_irq(dev, g_irq[i], ccache_int_handler, 0, "ccache_ecc", NULL);
|
||||
if (rc)
|
||||
return dev_err_probe(dev, rc, "Could not request IRQ %d\n", g_irq[i]);
|
||||
return rc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -59,12 +59,12 @@ static int cache_inval_done_one(struct cache_coherency_ops_inst *cci)
|
|||
|
||||
static int cache_invalidate_memregion(phys_addr_t addr, size_t size)
|
||||
{
|
||||
int ret;
|
||||
struct cache_coherency_ops_inst *cci;
|
||||
struct cc_inval_params params = {
|
||||
.addr = addr,
|
||||
.size = size,
|
||||
};
|
||||
int ret = -ENXIO;
|
||||
|
||||
guard(rwsem_read)(&cache_ops_instance_list_lock);
|
||||
list_for_each_entry(cci, &cache_ops_instance_list, node) {
|
||||
|
|
@ -78,7 +78,7 @@ static int cache_invalidate_memregion(phys_addr_t addr, size_t size)
|
|||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct cache_coherency_ops_inst *
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user