lkml.org 
[lkml]   [2021]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 05/10] x86/platform/intel-mid: Remove unused leftovers (msic_power_btn)
    Date
    There is no driver present, remove the device creation and other leftovers.

    Note, for Intel Merrifield there is another driver which is instantiated by
    a certain MFD one and does not need any support from device_libs.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    .../platform/intel-mid/device_libs/Makefile | 2 -
    .../device_libs/platform_mrfld_power_btn.c | 78 -------------------
    .../device_libs/platform_msic_power_btn.c | 31 --------
    3 files changed, 111 deletions(-)
    delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c
    delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c

    diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
    index 3688e62ccf80..177e91d565ca 100644
    --- a/arch/x86/platform/intel-mid/device_libs/Makefile
    +++ b/arch/x86/platform/intel-mid/device_libs/Makefile
    @@ -8,7 +8,6 @@ obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
    obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
    # IPC Devices
    obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
    -obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
    obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
    # SPI Devices
    obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
    @@ -24,5 +23,4 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
    obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
    # MISC Devices
    obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
    -obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_mrfld_power_btn.o
    obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o
    diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c
    deleted file mode 100644
    index ec2afb41b34a..000000000000
    --- a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c
    +++ /dev/null
    @@ -1,78 +0,0 @@
    -// SPDX-License-Identifier: GPL-2.0-only
    -/*
    - * Intel Merrifield power button support
    - *
    - * (C) Copyright 2017 Intel Corporation
    - *
    - * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    - */
    -
    -#include <linux/init.h>
    -#include <linux/ioport.h>
    -#include <linux/platform_device.h>
    -#include <linux/sfi.h>
    -
    -#include <asm/intel-mid.h>
    -#include <asm/intel_scu_ipc.h>
    -
    -static struct resource mrfld_power_btn_resources[] = {
    - {
    - .flags = IORESOURCE_IRQ,
    - },
    -};
    -
    -static struct platform_device mrfld_power_btn_dev = {
    - .name = "msic_power_btn",
    - .id = PLATFORM_DEVID_NONE,
    - .num_resources = ARRAY_SIZE(mrfld_power_btn_resources),
    - .resource = mrfld_power_btn_resources,
    -};
    -
    -static int mrfld_power_btn_scu_status_change(struct notifier_block *nb,
    - unsigned long code, void *data)
    -{
    - if (code == SCU_DOWN) {
    - platform_device_unregister(&mrfld_power_btn_dev);
    - return 0;
    - }
    -
    - return platform_device_register(&mrfld_power_btn_dev);
    -}
    -
    -static struct notifier_block mrfld_power_btn_scu_notifier = {
    - .notifier_call = mrfld_power_btn_scu_status_change,
    -};
    -
    -static int __init register_mrfld_power_btn(void)
    -{
    - if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)
    - return -ENODEV;
    -
    - /*
    - * We need to be sure that the SCU IPC is ready before
    - * PMIC power button device can be registered:
    - */
    - intel_scu_notifier_add(&mrfld_power_btn_scu_notifier);
    -
    - return 0;
    -}
    -arch_initcall(register_mrfld_power_btn);
    -
    -static void __init *mrfld_power_btn_platform_data(void *info)
    -{
    - struct resource *res = mrfld_power_btn_resources;
    - struct sfi_device_table_entry *pentry = info;
    -
    - res->start = res->end = pentry->irq;
    - return NULL;
    -}
    -
    -static const struct devs_id mrfld_power_btn_dev_id __initconst = {
    - .name = "bcove_power_btn",
    - .type = SFI_DEV_TYPE_IPC,
    - .delay = 1,
    - .msic = 1,
    - .get_platform_data = &mrfld_power_btn_platform_data,
    -};
    -
    -sfi_device(mrfld_power_btn_dev_id);
    diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
    deleted file mode 100644
    index 3d3de2d59726..000000000000
    --- a/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
    +++ /dev/null
    @@ -1,31 +0,0 @@
    -// SPDX-License-Identifier: GPL-2.0-only
    -/*
    - * platform_msic_power_btn.c: MSIC power btn platform data initialization file
    - *
    - * (C) Copyright 2013 Intel Corporation
    - * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
    - */
    -#include <linux/kernel.h>
    -#include <linux/interrupt.h>
    -#include <linux/scatterlist.h>
    -#include <linux/sfi.h>
    -#include <linux/init.h>
    -#include <linux/mfd/intel_msic.h>
    -#include <asm/intel-mid.h>
    -
    -#include "platform_msic.h"
    -
    -static void __init *msic_power_btn_platform_data(void *info)
    -{
    - return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_POWER_BTN);
    -}
    -
    -static const struct devs_id msic_power_btn_dev_id __initconst = {
    - .name = "msic_power_btn",
    - .type = SFI_DEV_TYPE_IPC,
    - .delay = 1,
    - .msic = 1,
    - .get_platform_data = &msic_power_btn_platform_data,
    -};
    -
    -sfi_device(msic_power_btn_dev_id);
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-26 02:31    [W:2.678 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site