korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'acpi-ec', 'acpi-apei' and 'pnp'

Browse Source 
Merge ACPI EC driver fixes, an ACPI APEI fix and PNP fixes for
6.10-rc3:

 - Fix error handling during EC operation region accesses in the ACPI EC
   driver (Armin Wolf).

 - Fix a memory leak in the APEI error injection driver introduced
   during its converion to a platform driver (Dan Williams).

 - Fix build failures related to the dev_is_pnp() macro by redefining it
   as a proper function and exporting it to modules as appropriate and
   unexport pnp_bus_type which need not be exported any more (Andy
   Shevchenko).

* acpi-ec:
  ACPI: EC: Avoid returning AE_OK on errors in address space handler
  ACPI: EC: Abort address space access upon error

* acpi-apei:
  ACPI: APEI: EINJ: Fix einj_dev release leak

* pnp:
  PNP: Hide pnp_bus_type from the non-PNP code
  PNP: Make dev_is_pnp() to be a function and export it for modules
This commit is contained in:
Rafael J. Wysocki 2024-06-05 16:58:09 +02:00
commit 1bfc0835d4
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/apei/einj-core.c
View File

@ -909,7 +909,7 @@ static void __exit einj_exit(void)
if (einj_initialized) if (einj_initialized)
platform_driver_unregister(&einj_driver); platform_driver_unregister(&einj_driver);
platform_device_del(einj_dev); platform_device_unregister(einj_dev);
} }
module_init(einj_init); module_init(einj_init);

9
drivers/acpi/ec.c
View File

@ -1333,10 +1333,13 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
if (ec->busy_polling || bits > 8) if (ec->busy_polling || bits > 8)
acpi_ec_burst_enable(ec); acpi_ec_burst_enable(ec);
for (i = 0; i < bytes; ++i, ++address, ++value) for (i = 0; i < bytes; ++i, ++address, ++value) {
result = (function == ACPI_READ) ? result = (function == ACPI_READ) ?
acpi_ec_read(ec, address, value) : acpi_ec_read(ec, address, value) :
acpi_ec_write(ec, address, *value); acpi_ec_write(ec, address, *value);
if (result < 0)
break;
}
if (ec->busy_polling || bits > 8) if (ec->busy_polling || bits > 8)
acpi_ec_burst_disable(ec); acpi_ec_burst_disable(ec);
@ -1348,8 +1351,10 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
return AE_NOT_FOUND; return AE_NOT_FOUND;
case -ETIME: case -ETIME:
return AE_TIME; return AE_TIME;
default: case 0:
return AE_OK; return AE_OK;
default:
return AE_ERROR;
} }
} }

1
drivers/pnp/base.h
View File

@ -6,6 +6,7 @@
extern struct mutex pnp_lock; extern struct mutex pnp_lock;
extern const struct attribute_group *pnp_dev_groups[]; extern const struct attribute_group *pnp_dev_groups[];
extern const struct bus_type pnp_bus_type;
int pnp_register_protocol(struct pnp_protocol *protocol); int pnp_register_protocol(struct pnp_protocol *protocol);
void pnp_unregister_protocol(struct pnp_protocol *protocol); void pnp_unregister_protocol(struct pnp_protocol *protocol);

6
drivers/pnp/driver.c
View File

@ -266,6 +266,12 @@ const struct bus_type pnp_bus_type = {
.dev_groups = pnp_dev_groups, .dev_groups = pnp_dev_groups,
}; };
bool dev_is_pnp(const struct device *dev)
{
return dev->bus == &pnp_bus_type;
}
EXPORT_SYMBOL_GPL(dev_is_pnp);
int pnp_register_driver(struct pnp_driver *drv) int pnp_register_driver(struct pnp_driver *drv)
{ {
drv->driver.name = drv->name; drv->driver.name = drv->name;

6
include/linux/pnp.h
View File

@ -435,8 +435,6 @@ struct pnp_protocol {
#define protocol_for_each_dev(protocol, dev) \ #define protocol_for_each_dev(protocol, dev) \
list_for_each_entry(dev, &(protocol)->devices, protocol_list) list_for_each_entry(dev, &(protocol)->devices, protocol_list)
extern const struct bus_type pnp_bus_type;
#if defined(CONFIG_PNP) #if defined(CONFIG_PNP)
/* device management */ /* device management */
@ -469,7 +467,7 @@ int compare_pnp_id(struct pnp_id *pos, const char *id);
int pnp_register_driver(struct pnp_driver *drv); int pnp_register_driver(struct pnp_driver *drv);
void pnp_unregister_driver(struct pnp_driver *drv); void pnp_unregister_driver(struct pnp_driver *drv);
#define dev_is_pnp(d) ((d)->bus == &pnp_bus_type) bool dev_is_pnp(const struct device *dev);
#else #else
@ -502,7 +500,7 @@ static inline int compare_pnp_id(struct pnp_id *pos, const char *id) { return -E
static inline int pnp_register_driver(struct pnp_driver *drv) { return -ENODEV; } static inline int pnp_register_driver(struct pnp_driver *drv) { return -ENODEV; }
static inline void pnp_unregister_driver(struct pnp_driver *drv) { } static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
#define dev_is_pnp(d) false static inline bool dev_is_pnp(const struct device *dev) { return false; }
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */