Merge tag 'mips_5.18_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux-block.git] / include / linux / rtsx_pci.h

diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index 4ab7bfc675f119738344494e87e8f30d00792204..3d780b44e678a482a14fb729985ec9afaea40aea 100644 (file)
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -1095,7 +1095,7 @@ struct pcr_ops {
        unsigned int    (*cd_deglitch)(struct rtsx_pcr *pcr);
        int             (*conv_clk_and_div_n)(int clk, int dir);
        void            (*fetch_vendor_settings)(struct rtsx_pcr *pcr);
-       void            (*force_power_down)(struct rtsx_pcr *pcr, u8 pm_state);
+       void            (*force_power_down)(struct rtsx_pcr *pcr, u8 pm_state, bool runtime);
        void            (*stop_cmd)(struct rtsx_pcr *pcr);
 
        void (*set_aspm)(struct rtsx_pcr *pcr, bool enable);
@@ -1201,8 +1201,6 @@ struct rtsx_pcr {
        unsigned int                    card_exist;
 
        struct delayed_work             carddet_work;
-       struct delayed_work             idle_work;
-       struct delayed_work             rtd3_work;
 
        spinlock_t                      lock;
        struct mutex                    pcr_mutex;
@@ -1212,7 +1210,6 @@ struct rtsx_pcr {
        unsigned int                    cur_clock;
        bool                            remove_pci;
        bool                            msi_en;
-       bool                            is_runtime_suspended;
 
 #define EXTRA_CAPS_SD_SDR50            (1 << 0)
 #define EXTRA_CAPS_SD_SDR104           (1 << 1)