Skip to content

Commit 9f68756

Browse files
jwrdegoederafaeljw
authored andcommitted
mmc: sdhci-acpi: Use the new soc_intel_is_byt() helper
Use the new soc_intel_is_byt() helper function from include/linux/platform_data/x86/soc.h . Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 8339abf commit 9f68756

1 file changed

Lines changed: 3 additions & 14 deletions

File tree

drivers/mmc/host/sdhci-acpi.c

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
#include <linux/mmc/slot-gpio.h>
3232

3333
#ifdef CONFIG_X86
34-
#include <asm/cpu_device_id.h>
35-
#include <asm/intel-family.h>
34+
#include <linux/platform_data/x86/soc.h>
3635
#include <asm/iosf_mbi.h>
3736
#endif
3837

@@ -239,16 +238,6 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = {
239238

240239
#ifdef CONFIG_X86
241240

242-
static bool sdhci_acpi_byt(void)
243-
{
244-
static const struct x86_cpu_id byt[] = {
245-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, NULL),
246-
{}
247-
};
248-
249-
return x86_match_cpu(byt);
250-
}
251-
252241
#define BYT_IOSF_SCCEP 0x63
253242
#define BYT_IOSF_OCP_NETCTRL0 0x1078
254243
#define BYT_IOSF_OCP_TIMEOUT_BASE GENMASK(10, 8)
@@ -257,7 +246,7 @@ static void sdhci_acpi_byt_setting(struct device *dev)
257246
{
258247
u32 val = 0;
259248

260-
if (!sdhci_acpi_byt())
249+
if (!soc_intel_is_byt())
261250
return;
262251

263252
if (iosf_mbi_read(BYT_IOSF_SCCEP, MBI_CR_READ, BYT_IOSF_OCP_NETCTRL0,
@@ -282,7 +271,7 @@ static void sdhci_acpi_byt_setting(struct device *dev)
282271

283272
static bool sdhci_acpi_byt_defer(struct device *dev)
284273
{
285-
if (!sdhci_acpi_byt())
274+
if (!soc_intel_is_byt())
286275
return false;
287276

288277
if (!iosf_mbi_available())

0 commit comments

Comments
 (0)