Commit 1bfc0835 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

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
parents ac62f521 c4bd7f1d 7ff6c798 edcde848

drivers/acpi/apei/einj-core.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ static void __exit einj_exit(void) 
	if (einj_initialized)

		platform_driver_unregister(&einj_driver);



	platform_device_del(einj_dev);

	platform_device_unregister(einj_dev);

}



module_init(einj_init);

drivers/acpi/ec.c

+7 −2
Original line number Diff line number Diff line
@@ -1333,10 +1333,13 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
	if (ec->busy_polling || bits > 8)

		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) ?

			acpi_ec_read(ec, address, value) :

			acpi_ec_write(ec, address, *value);

		if (result < 0)

			break;

	}



	if (ec->busy_polling || bits > 8)

		acpi_ec_burst_disable(ec);
@@ -1348,8 +1351,10 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
		return AE_NOT_FOUND;

	case -ETIME:

		return AE_TIME;

	default:

	case 0:

		return AE_OK;

	default:

		return AE_ERROR;

	}

}

drivers/pnp/base.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


extern struct mutex pnp_lock;

extern const struct attribute_group *pnp_dev_groups[];

extern const struct bus_type pnp_bus_type;



int pnp_register_protocol(struct pnp_protocol *protocol);

void pnp_unregister_protocol(struct pnp_protocol *protocol);

drivers/pnp/driver.c

+6 −0
Original line number Diff line number Diff line
@@ -266,6 +266,12 @@ const struct bus_type pnp_bus_type = { 
	.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)

{

	drv->driver.name = drv->name;

include/linux/pnp.h

+2 −4
Original line number Diff line number Diff line
@@ -435,8 +435,6 @@ struct pnp_protocol { 
#define protocol_for_each_dev(protocol, dev)	\

	list_for_each_entry(dev, &(protocol)->devices, protocol_list)



extern const struct bus_type pnp_bus_type;



#if defined(CONFIG_PNP)



/* 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);

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
@@ -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 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 */