misc: rtsx: Clean up Realtek card reader driver
Subsystems (2)
cover misc: rtsx: Clean up Realtek card reader driver
From: Bjorn Helgaas <[email protected]>
These are minor cleanups of the Realtek card reader driver. They shouldn't fix or break anything by themselves; they're just to make it slightly more readable and maintainable.
Bjorn Helgaas (6):
misc: rtsx: Remove unused pcr_ops
misc: rtsx: Removed unused dev_aspm_mode
misc: rtsx: Use ASPM_MASK_NEG instead of hard-coded value
misc: rtsx: Use pcie_capability_clear_and_set_word() for
PCI_EXP_LNKCTL
misc: rtsx: Simplify rtsx_comm_set_aspm()
misc: rtsx: Remove unnecessary rts5249_set_aspm(), rts5260_set_aspm()
drivers/misc/cardreader/rts5249.c | 29 -------------------- drivers/misc/cardreader/rts5260.c | 26 ------------------ drivers/misc/cardreader/rts5261.c | 38 +++----------------------- drivers/misc/cardreader/rtsx_pcr.c | 43 ++++++------------------------ drivers/misc/cardreader/rtsx_pcr.h | 1 - include/linux/rtsx_pci.h | 25 ----------------- 6 files changed, 12 insertions(+), 150 deletions(-)
base-commit: 8f3d9f354286745c751374f5f1fcafee6b3f3136
Signature · 1 line
2.25.1
PATCH 1/6 misc: rtsx: Remove unused pcr_ops
From: Bjorn Helgaas <[email protected]>
Remove the following unused function pointers from struct pcr_ops:
int (*set_ltr_latency)(struct rtsx_pcr *pcr, u32 latency); int (*set_l1off_sub)(struct rtsx_pcr *pcr, u8 val); void (*full_on)(struct rtsx_pcr *pcr); void (*power_saving)(struct rtsx_pcr *pcr);
--- drivers/misc/cardreader/rtsx_pcr.c | 15 +++------------ include/linux/rtsx_pci.h | 4 ---- 2 files changed, 3 insertions(+), 16 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +3 -12
@@ -85,10 +85,7 @@ static int rtsx_comm_set_ltr_latency(struct rtsx_pcr *pcr, u32 latency)int rtsx_set_ltr_latency (struct rtsx_pcr *pcr,u32 latency) { -if (pcr->ops->set_ltr_latency) -return pcr->ops->set_ltr_latency (pcr, latency); -else -return rtsx_comm_set_ltr_latency (pcr, latency); +return rtsx_comm_set_ltr_latency (pcr, latency); }static void rtsx_comm_set_aspm (struct rtsx_pcr *pcr,bool enable)
@@ -151,10 +148,7 @@ static void rtsx_comm_pm_full_on(struct rtsx_pcr *pcr)static void rtsx_pm_full_on (struct rtsx_pcr *pcr) { -if (pcr->ops->full_on) - pcr->ops->full_on (pcr); -else -rtsx_comm_pm_full_on (pcr); +rtsx_comm_pm_full_on (pcr); }void rtsx_pci_start_run (struct rtsx_pcr *pcr)
@@ -1108,10 +1102,7 @@ static void rtsx_comm_pm_power_saving(struct rtsx_pcr *pcr)static void rtsx_pm_power_saving (struct rtsx_pcr *pcr) { -if (pcr->ops->power_saving) - pcr->ops->power_saving (pcr); -else -rtsx_comm_pm_power_saving (pcr); +rtsx_comm_pm_power_saving (pcr); }static void rtsx_pci_idle_work (struct work_struct *work)
include/linux/rtsx_pci.h +0 -4
@@ -1080,11 +1080,7 @@ struct pcr_ops {void (*stop_cmd)(struct rtsx_pcr *pcr);void (*set_aspm)(struct rtsx_pcr *pcr,bool enable); -int (*set_ltr_latency)(struct rtsx_pcr *pcr,u32 latency); -int (*set_l1off_sub)(struct rtsx_pcr *pcr,u8 val);void (*set_l1off_cfg_sub_d0)(struct rtsx_pcr *pcr,int active); -void (*full_on)(struct rtsx_pcr *pcr); -void (*power_saving)(struct rtsx_pcr *pcr);void (*enable_ocp)(struct rtsx_pcr *pcr);void (*disable_ocp)(struct rtsx_pcr *pcr);void (*init_ocp)(struct rtsx_pcr *pcr);
Signature · 1 line
2.25.1
PATCH 2/6 misc: rtsx: Removed unused dev_aspm_mode
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
The struct rtsx_cr_option.dev_aspm_mode member is never set to anything other than DEV_ASPM_DYNAMIC (0). Remove it and code that tests it. No functional change intended.
--- drivers/misc/cardreader/rts5249.c | 19 ++++------------ drivers/misc/cardreader/rts5260.c | 18 ++++----------- drivers/misc/cardreader/rts5261.c | 36 +++++------------------------- drivers/misc/cardreader/rtsx_pcr.c | 19 ++++------------ include/linux/rtsx_pci.h | 9 -------- 5 files changed, 18 insertions(+), 83 deletions(-)
drivers/misc/cardreader/rts5249.c +4 -15
@@ -349,25 +349,15 @@ static int rtsx_base_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)static void rts5249_set_aspm (struct rtsx_pcr *pcr,bool enable) { -struct rtsx_cr_option *option = &pcr->option;u8 val =0 ;if (pcr->aspm_enabled == enable)return ; -if (option->dev_aspm_mode ==DEV_ASPM_DYNAMIC ) { -if (enable) - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, - pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); - }else if (option->dev_aspm_mode ==DEV_ASPM_BACKDOOR ) { -u8 mask =FORCE_ASPM_VAL_MASK |FORCE_ASPM_CTL0 ; - -if (!enable) - val =FORCE_ASPM_CTL0 ; -rtsx_pci_write_register (pcr,ASPM_FORCE_CTL , mask, val); - } +if (enable) + val = pcr->aspm_en; +rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , +ASPM_MASK_NEG , val); pcr->aspm_enabled = enable; }
@@ -471,7 +461,6 @@ void rts5249_init_params(struct rtsx_pcr *pcr) option->ltr_active_latency =LTR_ACTIVE_LATENCY_DEF ; option->ltr_idle_latency =LTR_IDLE_LATENCY_DEF ; option->ltr_l1off_latency =LTR_L1OFF_LATENCY_DEF ; - option->dev_aspm_mode =DEV_ASPM_DYNAMIC ; option->l1_snooze_delay =L1_SNOOZE_DELAY_DEF ; option->ltr_l1off_sspwrgate =LTR_L1OFF_SSPWRGATE_5249_DEF ; option->ltr_l1off_snooze_sspwrgate =
drivers/misc/cardreader/rts5260.c +4 -14
@@ -572,24 +572,15 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)static void rts5260_set_aspm (struct rtsx_pcr *pcr,bool enable) { -struct rtsx_cr_option *option = &pcr->option;u8 val =0 ;if (pcr->aspm_enabled == enable)return ; -if (option->dev_aspm_mode ==DEV_ASPM_DYNAMIC ) { -if (enable) - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); - }else if (option->dev_aspm_mode ==DEV_ASPM_BACKDOOR ) { -u8 mask =FORCE_ASPM_VAL_MASK |FORCE_ASPM_CTL0 ; - -if (!enable) - val =FORCE_ASPM_CTL0 ; -rtsx_pci_write_register (pcr,ASPM_FORCE_CTL , mask, val); - } +if (enable) + val = pcr->aspm_en; +rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , +ASPM_MASK_NEG , val); pcr->aspm_enabled = enable; }
@@ -683,7 +674,6 @@ void rts5260_init_params(struct rtsx_pcr *pcr) option->ltr_active_latency =LTR_ACTIVE_LATENCY_DEF ; option->ltr_idle_latency =LTR_IDLE_LATENCY_DEF ; option->ltr_l1off_latency =LTR_L1OFF_LATENCY_DEF ; - option->dev_aspm_mode =DEV_ASPM_DYNAMIC ; option->l1_snooze_delay =L1_SNOOZE_DELAY_DEF ; option->ltr_l1off_sspwrgate =LTR_L1OFF_SSPWRGATE_5250_DEF ; option->ltr_l1off_snooze_sspwrgate =
drivers/misc/cardreader/rts5261.c +6 -30
@@ -518,51 +518,28 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)static void rts5261_enable_aspm (struct rtsx_pcr *pcr,bool enable) { -struct rtsx_cr_option *option = &pcr->option;u8 val =0 ;if (pcr->aspm_enabled == enable)return ; -if (option->dev_aspm_mode ==DEV_ASPM_DYNAMIC ) { - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); - }else if (option->dev_aspm_mode ==DEV_ASPM_BACKDOOR ) { -u8 mask =FORCE_ASPM_VAL_MASK |FORCE_ASPM_CTL0 ; - - val =FORCE_ASPM_CTL0 ; - val |= (pcr->aspm_en &0x02 ); -rtsx_pci_write_register (pcr,ASPM_FORCE_CTL , mask, val); - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); - } + val = pcr->aspm_en; +rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , +ASPM_MASK_NEG , val); pcr->aspm_enabled = enable; }static void rts5261_disable_aspm (struct rtsx_pcr *pcr,bool enable) { -struct rtsx_cr_option *option = &pcr->option;u8 val =0 ;if (pcr->aspm_enabled == enable)return ; -if (option->dev_aspm_mode ==DEV_ASPM_DYNAMIC ) { - val =0 ; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); - }else if (option->dev_aspm_mode ==DEV_ASPM_BACKDOOR ) { -u8 mask =FORCE_ASPM_VAL_MASK |FORCE_ASPM_CTL0 ; - - val =0 ; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); - val =FORCE_ASPM_CTL0 ; -rtsx_pci_write_register (pcr,ASPM_FORCE_CTL , mask, val); - } + val =0 ; +rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , +ASPM_MASK_NEG , val);rtsx_pci_write_register (pcr,SD_CFG1 ,SD_ASYNC_FIFO_NOT_RST ,0 );udelay (10 ); pcr->aspm_enabled = enable;
@@ -784,7 +761,6 @@ void rts5261_init_params(struct rtsx_pcr *pcr) option->l1_snooze_delay =L1_SNOOZE_DELAY_DEF ; option->ltr_l1off_sspwrgate =0x7F ; option->ltr_l1off_snooze_sspwrgate =0x78 ; - option->dev_aspm_mode =DEV_ASPM_DYNAMIC ; option->ocp_en =1 ; hw_param->interrupt_en |=SD_OC_INT_EN ;
drivers/misc/cardreader/rtsx_pcr.c +4 -15
@@ -90,24 +90,13 @@ int rtsx_set_ltr_latency(struct rtsx_pcr *pcr, u32 latency)static void rtsx_comm_set_aspm (struct rtsx_pcr *pcr,bool enable) { -struct rtsx_cr_option *option = &pcr->option; -if (pcr->aspm_enabled == enable)return ; -if (option->dev_aspm_mode ==DEV_ASPM_DYNAMIC ) { -if (enable) -rtsx_pci_enable_aspm (pcr); -else -rtsx_pci_disable_aspm (pcr); - }else if (option->dev_aspm_mode ==DEV_ASPM_BACKDOOR ) { -u8 mask =FORCE_ASPM_VAL_MASK ; -u8 val =0 ; - -if (enable) - val = pcr->aspm_en; -rtsx_pci_write_register (pcr,ASPM_FORCE_CTL , mask, val); - } +if (enable) +rtsx_pci_enable_aspm (pcr); +else +rtsx_pci_disable_aspm (pcr); pcr->aspm_enabled = enable; }
include/linux/rtsx_pci.h +0 -9
@@ -1104,13 +1104,6 @@ enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN};#define L1_SNOOZE_TEST_EN BIT(5)#define LTR_L1SS_PWR_GATE_CHECK_CARD_EN BIT(6) -enum dev_aspm_mode { -DEV_ASPM_DYNAMIC , -DEV_ASPM_BACKDOOR , -DEV_ASPM_STATIC , -DEV_ASPM_DISABLE , -}; -/* * struct rtsx_cr_option - card reader option * @dev_flags: device flags
@@ -1121,7 +1114,6 @@ enum dev_aspm_mode {* @ltr_active_latency: ltr mode active latency * @ltr_idle_latency: ltr mode idle latency * @ltr_l1off_latency: ltr mode l1off latency -* @dev_aspm_mode: device aspm mode * @l1_snooze_delay: l1 snooze delay * @ltr_l1off_sspwrgate: ltr l1off sspwrgate * @ltr_l1off_snooze_sspwrgate: ltr l1off snooze sspwrgate
@@ -1138,7 +1130,6 @@ struct rtsx_cr_option {u32 ltr_active_latency;u32 ltr_idle_latency;u32 ltr_l1off_latency; -enum dev_aspm_mode dev_aspm_mode;u32 l1_snooze_delay;u8 ltr_l1off_sspwrgate;u8 ltr_l1off_snooze_sspwrgate;
Signature · 1 line
2.25.1
PATCH 3/6 misc: rtsx: Use ASPM_MASK_NEG instead of hard-coded value
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Use ASPM_MASK_NEG instead of hard-coded value, as other callers of rtsx_pci_update_cfg_byte() do. No functional change intended.
--- drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +2 -2
@@ -58,13 +58,13 @@ MODULE_DEVICE_TABLE(pci, rtsx_pci_ids);static inline void rtsx_pci_enable_aspm (struct rtsx_pcr *pcr) {rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -0xFC , pcr->aspm_en); +ASPM_MASK_NEG , pcr->aspm_en); }static inline void rtsx_pci_disable_aspm (struct rtsx_pcr *pcr) {rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -0xFC ,0 ); +ASPM_MASK_NEG ,0 ); }static int rtsx_comm_set_ltr_latency (struct rtsx_pcr *pcr,u32 latency)
Signature · 1 line
2.25.1
PATCH 4/6 misc: rtsx: Use pcie_capability_clear_and_set_word() for PCI_EXP_LNKCTL
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Instead of using the driver-specific rtsx_pci_update_cfg_byte() to update the PCIe Link Control Register, use pcie_capability_clear_and_set_word() like the rest of the kernel does. This makes it easier to maintain ASPM across the PCI core and drivers.
Remove the now-unused rtsx_pci_update_cfg_byte() and ASPM_MASK_NEG definitions.
No functional change intended.
--- drivers/misc/cardreader/rts5249.c | 9 +++------ drivers/misc/cardreader/rts5260.c | 9 +++------ drivers/misc/cardreader/rts5261.c | 14 ++++---------- drivers/misc/cardreader/rtsx_pcr.c | 8 ++++---- drivers/misc/cardreader/rtsx_pcr.h | 1 - include/linux/rtsx_pci.h | 12 ------------ 6 files changed, 14 insertions(+), 39 deletions(-)
drivers/misc/cardreader/rts5249.c +3 -6
@@ -349,15 +349,12 @@ static int rtsx_base_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)static void rts5249_set_aspm (struct rtsx_pcr *pcr,bool enable) { -u8 val =0 ; -if (pcr->aspm_enabled == enable)return ; -if (enable) - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + enable ? pcr->aspm_en :0 ); pcr->aspm_enabled = enable; }
drivers/misc/cardreader/rts5260.c +3 -6
@@ -572,15 +572,12 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)static void rts5260_set_aspm (struct rtsx_pcr *pcr,bool enable) { -u8 val =0 ; -if (pcr->aspm_enabled == enable)return ; -if (enable) - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + enable ? pcr->aspm :0 ); pcr->aspm_enabled = enable; }
drivers/misc/cardreader/rts5261.c +4 -10
@@ -518,28 +518,22 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)static void rts5261_enable_aspm (struct rtsx_pcr *pcr,bool enable) { -u8 val =0 ; -if (pcr->aspm_enabled == enable)return ; - val = pcr->aspm_en; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , pcr->aspm_en); pcr->aspm_enabled = enable; }static void rts5261_disable_aspm (struct rtsx_pcr *pcr,bool enable) { -u8 val =0 ; -if (pcr->aspm_enabled == enable)return ; - val =0 ; -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , val); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC ,0 );rtsx_pci_write_register (pcr,SD_CFG1 ,SD_ASYNC_FIFO_NOT_RST ,0 );udelay (10 ); pcr->aspm_enabled = enable;
drivers/misc/cardreader/rtsx_pcr.c +4 -4
@@ -57,14 +57,14 @@ MODULE_DEVICE_TABLE(pci, rtsx_pci_ids);static inline void rtsx_pci_enable_aspm (struct rtsx_pcr *pcr) { -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG , pcr->aspm_en); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , pcr->aspm_en); }static inline void rtsx_pci_disable_aspm (struct rtsx_pcr *pcr) { -rtsx_pci_update_cfg_byte (pcr, pcr->pcie_cap +PCI_EXP_LNKCTL , -ASPM_MASK_NEG ,0 ); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC ,0 ); }static int rtsx_comm_set_ltr_latency (struct rtsx_pcr *pcr,u32 latency)
drivers/misc/cardreader/rtsx_pcr.h +0 -1
@@ -29,7 +29,6 @@#define LTR_L1OFF_SNOOZE_SSPWRGATE_5249_DEF 0xAC#define LTR_L1OFF_SNOOZE_SSPWRGATE_5250_DEF 0xF8#define CMD_TIMEOUT_DEF 100 -#define ASPM_MASK_NEG 0xFC#define MASK_8_BIT_DEF 0xFF#define SSC_CLOCK_STABLE_WAIT 130
include/linux/rtsx_pci.h +0 -12
@@ -1307,18 +1307,6 @@ static inline u8 *rtsx_pci_get_cmd_data(struct rtsx_pcr *pcr)return (u8 *)(pcr->host_cmds_ptr); } -static inline int rtsx_pci_update_cfg_byte (struct rtsx_pcr *pcr,int addr, -u8 mask,u8 append) -{ -int err; -u8 val; - - err =pci_read_config_byte (pcr->pci, addr, &val); -if (err <0 ) -return err; -return pci_write_config_byte (pcr->pci, addr, (val & mask) | append); -} -static inline void rtsx_pci_write_be32 (struct rtsx_pcr *pcr,u16 reg,u32 val) {rtsx_pci_add_cmd (pcr,WRITE_REG_CMD , reg,0xFF , val >>24 );
Signature · 1 line
2.25.1
PATCH 5/6 misc: rtsx: Simplify rtsx_comm_set_aspm()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Simplify rtsx_comm_set_aspm() and remove the now-unused rtsx_pci_enable_aspm().
rtsx_pci_disable_aspm() is still used by rtsx_pci_init_hw().
--- drivers/misc/cardreader/rtsx_pcr.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/misc/cardreader/rtsx_pcr.c +3 -10
@@ -55,12 +55,6 @@ static const struct pci_device_id rtsx_pci_ids[] = {MODULE_DEVICE_TABLE (pci, rtsx_pci_ids); -static inline void rtsx_pci_enable_aspm (struct rtsx_pcr *pcr) -{ -pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , -PCI_EXP_LNKCTL_ASPMC , pcr->aspm_en); -} -static inline void rtsx_pci_disable_aspm (struct rtsx_pcr *pcr) { pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,
@@ -93,10 +87,9 @@ static void rtsx_comm_set_aspm(struct rtsx_pcr *pcr, bool enable)if (pcr->aspm_enabled == enable)return ; -if (enable) -rtsx_pci_enable_aspm (pcr); -else -rtsx_pci_disable_aspm (pcr); +pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + enable ? pcr->aspm_en :0 ); pcr->aspm_enabled = enable; }
Signature · 1 line
2.25.1
PATCH 6/6 misc: rtsx: Remove unnecessary rts5249_set_aspm(), rts5260_set_aspm()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
rts5249_set_aspm() and rts5260_set_aspm() do nothing more than the default rtsx_comm_set_aspm() does, so remove them and use the default. No functional change intended.
--- drivers/misc/cardreader/rts5249.c | 15 --------------- drivers/misc/cardreader/rts5260.c | 13 ------------- 2 files changed, 28 deletions(-)
drivers/misc/cardreader/rts5249.c +0 -15
@@ -347,18 +347,6 @@ static int rtsx_base_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)return rtsx_pci_send_cmd (pcr,100 ); } -static void rts5249_set_aspm (struct rtsx_pcr *pcr,bool enable) -{ -if (pcr->aspm_enabled == enable) -return ; - -pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , -PCI_EXP_LNKCTL_ASPMC , - enable ? pcr->aspm_en :0 ); - - pcr->aspm_enabled = enable; -} -static const struct pcr_ops rts5249_pcr_ops = { .fetch_vendor_settings = rtsx_base_fetch_vendor_settings, .extra_init_hw = rts5249_extra_init_hw,
@@ -371,7 +359,6 @@ static const struct pcr_ops rts5249_pcr_ops = { .card_power_off = rtsx_base_card_power_off, .switch_output_voltage = rtsx_base_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, - .set_aspm = rts5249_set_aspm, };/* SD Pull Control Enable:
@@ -598,7 +585,6 @@ static const struct pcr_ops rts524a_pcr_ops = { .switch_output_voltage = rtsx_base_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, - .set_aspm = rts5249_set_aspm, };void rts524a_init_params (struct rtsx_pcr *pcr)
@@ -714,7 +700,6 @@ static const struct pcr_ops rts525a_pcr_ops = { .switch_output_voltage = rts525a_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, .set_l1off_cfg_sub_d0 = rts5250_set_l1off_cfg_sub_d0, - .set_aspm = rts5249_set_aspm, };void rts525a_init_params (struct rtsx_pcr *pcr)
drivers/misc/cardreader/rts5260.c +0 -13
@@ -570,18 +570,6 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)return 0 ; } -static void rts5260_set_aspm (struct rtsx_pcr *pcr,bool enable) -{ -if (pcr->aspm_enabled == enable) -return ; - -pcie_capability_clear_and_set_word (pcr->pci,PCI_EXP_LNKCTL , -PCI_EXP_LNKCTL_ASPMC , - enable ? pcr->aspm :0 ); - - pcr->aspm_enabled = enable; -} -static void rts5260_set_l1off_cfg_sub_d0 (struct rtsx_pcr *pcr,int active) {struct rtsx_cr_option *option = &pcr->option;
@@ -627,7 +615,6 @@ static const struct pcr_ops rts5260_pcr_ops = { .switch_output_voltage = rts5260_switch_output_voltage, .force_power_down = rtsx_base_force_power_down, .stop_cmd = rts5260_stop_cmd, - .set_aspm = rts5260_set_aspm, .set_l1off_cfg_sub_d0 = rts5260_set_l1off_cfg_sub_d0, .enable_ocp = rts5260_enable_ocp, .disable_ocp = rts5260_disable_ocp,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerQuoted 5 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
These are minor cleanups of the Realtek card reader driver. They shouldn't fix or break anything by themselves; they're just to make it slightly more readable and maintainable.
Thanks for these, they all look sane and I've queued them up in my tree now.
greg k-h