Commit c8831184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v5.16-4' of... 

Merge tag 'platform-drivers-x86-v5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Hans de Goede:
 "Various bug-fixes"

* tag 'platform-drivers-x86-v5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: intel_pmc_core: fix memleak on registration failure
  platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL
  platform/x86: system76_acpi: Guard System76 EC specific functionality
  platform/x86: apple-gmux: use resource_size() with res
  platform/x86: amd-pmc: only use callbacks for suspend
  platform/mellanox: mlxbf-pmc: Fix an IS_ERR() vs NULL bug in mlxbf_pmc_map_counters
parents 7a29b11d 26a8b094

drivers/platform/mellanox/mlxbf-pmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1374,8 +1374,8 @@ static int mlxbf_pmc_map_counters(struct device *dev) 
		pmc->block[i].counters = info[2];

		pmc->block[i].type = info[3];



		if (IS_ERR(pmc->block[i].mmio_base))

			return PTR_ERR(pmc->block[i].mmio_base);

		if (!pmc->block[i].mmio_base)

			return -ENOMEM;



		ret = mlxbf_pmc_create_groups(dev, i);

		if (ret)

drivers/platform/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o 
obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o



# Intel

obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/

obj-y				+= intel/



# MSI

obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o

drivers/platform/x86/amd-pmc.c

+2 −1
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ static int __maybe_unused amd_pmc_resume(struct device *dev) 
}



static const struct dev_pm_ops amd_pmc_pm_ops = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(amd_pmc_suspend, amd_pmc_resume)

	.suspend_noirq = amd_pmc_suspend,

	.resume_noirq = amd_pmc_resume,

};



static const struct pci_device_id pmc_pci_ids[] = {

drivers/platform/x86/apple-gmux.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) 
	}



	gmux_data->iostart = res->start;

	gmux_data->iolen = res->end - res->start;

	gmux_data->iolen = resource_size(res);



	if (gmux_data->iolen < GMUX_MIN_IO_LEN) {

		pr_err("gmux I/O region too small (%lu < %u)\n",

drivers/platform/x86/intel/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -3,19 +3,6 @@ 
# Intel x86 Platform Specific Drivers

#



menuconfig X86_PLATFORM_DRIVERS_INTEL

	bool "Intel x86 Platform Specific Device Drivers"

	default y

	help

	  Say Y here to get to see options for device drivers for

	  various Intel x86 platforms, including vendor-specific

	  drivers. This option alone does not add any kernel code.



	  If you say N, all options in this submenu will be skipped

	  and disabled.



if X86_PLATFORM_DRIVERS_INTEL



source "drivers/platform/x86/intel/atomisp2/Kconfig"

source "drivers/platform/x86/intel/int1092/Kconfig"

source "drivers/platform/x86/intel/int33fe/Kconfig"
@@ -183,5 +170,3 @@ config INTEL_UNCORE_FREQ_CONTROL 


	  To compile this driver as a module, choose M here: the module

	  will be called intel-uncore-frequency.
 


endif # X86_PLATFORM_DRIVERS_INTEL