| Message ID | 20190826044630.21949-1-kai.heng.feng@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode | expand |
On Mon, Aug 26, 2019 at 12:46:29PM +0800, Kai-Heng Feng wrote: > The option named "auto_delink_en" is a bit misleading, as setting it to > false doesn't really disable auto-delink but let auto-delink be firmware > controlled. > > Rename it to reflect the real usage of this parameter. > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > drivers/usb/storage/realtek_cr.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c > index cc794e25a0b6..4d86cfcc0b40 100644 > --- a/drivers/usb/storage/realtek_cr.c > +++ b/drivers/usb/storage/realtek_cr.c > @@ -36,9 +36,9 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader"); > MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>"); > MODULE_LICENSE("GPL"); > > -static int auto_delink_en = 1; > -module_param(auto_delink_en, int, S_IRUGO | S_IWUSR); > -MODULE_PARM_DESC(auto_delink_en, "enable auto delink"); > +static int auto_delink_mode = 1; > +module_param(auto_delink_mode, int, S_IRUGO | S_IWUSR); > +MODULE_PARM_DESC(auto_delink_mode, "auto delink mode (0=firmware, 1=software [default])"); We can not just rename module parameters, as that will break working systems that have their startup scripts using those names :( sorry, greg k-h
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index cc794e25a0b6..4d86cfcc0b40 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c @@ -36,9 +36,9 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader"); MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>"); MODULE_LICENSE("GPL"); -static int auto_delink_en = 1; -module_param(auto_delink_en, int, S_IRUGO | S_IWUSR); -MODULE_PARM_DESC(auto_delink_en, "enable auto delink"); +static int auto_delink_mode = 1; +module_param(auto_delink_mode, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(auto_delink_mode, "auto delink mode (0=firmware, 1=software [default])"); #ifdef CONFIG_REALTEK_AUTOPM static int ss_en = 1; @@ -567,7 +567,7 @@ static int config_autodelink_after_power_on(struct us_data *us) if (retval < 0) return -EIO; - if (auto_delink_en) { + if (auto_delink_mode) { CLR_BIT(value, 0); CLR_BIT(value, 1); SET_BIT(value, 2); @@ -630,7 +630,7 @@ static int config_autodelink_before_power_down(struct us_data *us) if (!CHK_AUTO_DELINK(chip)) return 0; - if (auto_delink_en) { + if (auto_delink_mode) { retval = rts51x_read_mem(us, 0xFE77, &value, 1); if (retval < 0) return -EIO;
The option named "auto_delink_en" is a bit misleading, as setting it to false doesn't really disable auto-delink but let auto-delink be firmware controlled. Rename it to reflect the real usage of this parameter. Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/usb/storage/realtek_cr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)