| Message ID | 20181110181101.24557-3-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/5] drivercore: Revert "deferral race condition fix" | expand |
On 11/10/18 10:10 AM, Andy Shevchenko wrote: > Since we are going to use the same in Designware USB 3 driver, > rename the property to be consistent across the drivers. > > No functional change intended. > > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/platform/x86/intel_cht_int33fe.c | 2 +- > drivers/usb/typec/tcpm/fusb302.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c > index 464fe93657b5..87cbf18d0305 100644 > --- a/drivers/platform/x86/intel_cht_int33fe.c > +++ b/drivers/platform/x86/intel_cht_int33fe.c > @@ -79,7 +79,7 @@ static const struct property_entry max17047_props[] = { > }; > > static const struct property_entry fusb302_props[] = { > - PROPERTY_ENTRY_STRING("fcs,extcon-name", "cht_wcove_pwrsrc"), > + PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), > PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000), > PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000), > PROPERTY_ENTRY_U32("fcs,max-sink-microwatt", 36000000), > diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c > index 6d332066202b..62816ac571a0 100644 > --- a/drivers/usb/typec/tcpm/fusb302.c > +++ b/drivers/usb/typec/tcpm/fusb302.c > @@ -1765,7 +1765,7 @@ static int fusb302_probe(struct i2c_client *client, > * to be set by the platform code which also registers the i2c client > * for the fusb302. > */ > - if (device_property_read_string(dev, "fcs,extcon-name", &name) == 0) { > + if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) { > chip->extcon = extcon_get_extcon_dev(name); > if (IS_ERR(chip->extcon)) > return PTR_ERR(chip->extcon); >
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 464fe93657b5..87cbf18d0305 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -79,7 +79,7 @@ static const struct property_entry max17047_props[] = { }; static const struct property_entry fusb302_props[] = { - PROPERTY_ENTRY_STRING("fcs,extcon-name", "cht_wcove_pwrsrc"), + PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000), PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000), PROPERTY_ENTRY_U32("fcs,max-sink-microwatt", 36000000), diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c index 6d332066202b..62816ac571a0 100644 --- a/drivers/usb/typec/tcpm/fusb302.c +++ b/drivers/usb/typec/tcpm/fusb302.c @@ -1765,7 +1765,7 @@ static int fusb302_probe(struct i2c_client *client, * to be set by the platform code which also registers the i2c client * for the fusb302. */ - if (device_property_read_string(dev, "fcs,extcon-name", &name) == 0) { + if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) { chip->extcon = extcon_get_extcon_dev(name); if (IS_ERR(chip->extcon)) return PTR_ERR(chip->extcon);
Since we are going to use the same in Designware USB 3 driver, rename the property to be consistent across the drivers. No functional change intended. Cc: Hans de Goede <hdegoede@redhat.com> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/platform/x86/intel_cht_int33fe.c | 2 +- drivers/usb/typec/tcpm/fusb302.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)