| Message ID | 20240926122944.1251923-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 82375469755662b9910a22da14027cbef2bca666 |
| Headers | show |
| Series | [v2,1/1] usb: typec: stusb160x: Make use of i2c_get_match_data() | expand |
On Thu, Sep 26, 2024 at 03:29:15PM +0300, Andy Shevchenko wrote: > Get matching data in one step by switching to use i2c_get_match_data(). > As a positive side effect the matching data is qualified as a constant. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > v2: fixed rebase issue which led to the compilation error (LKP) > drivers/usb/typec/stusb160x.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/typec/stusb160x.c b/drivers/usb/typec/stusb160x.c > index f3140fc04c12..6d85b25b40bc 100644 > --- a/drivers/usb/typec/stusb160x.c > +++ b/drivers/usb/typec/stusb160x.c > @@ -633,9 +633,8 @@ MODULE_DEVICE_TABLE(of, stusb160x_of_match); > > static int stusb160x_probe(struct i2c_client *client) > { > + const struct regmap_config *regmap_config; > struct stusb160x *chip; > - const struct of_device_id *match; > - struct regmap_config *regmap_config; > struct fwnode_handle *fwnode; > int ret; > > @@ -645,8 +644,8 @@ static int stusb160x_probe(struct i2c_client *client) > > i2c_set_clientdata(client, chip); > > - match = i2c_of_match_device(stusb160x_of_match, client); > - regmap_config = (struct regmap_config *)match->data; > + regmap_config = i2c_get_match_data(client); > + > chip->regmap = devm_regmap_init_i2c(client, regmap_config); > if (IS_ERR(chip->regmap)) { > ret = PTR_ERR(chip->regmap); > -- > 2.43.0.rc1.1336.g36b5255a03ac
diff --git a/drivers/usb/typec/stusb160x.c b/drivers/usb/typec/stusb160x.c index f3140fc04c12..6d85b25b40bc 100644 --- a/drivers/usb/typec/stusb160x.c +++ b/drivers/usb/typec/stusb160x.c @@ -633,9 +633,8 @@ MODULE_DEVICE_TABLE(of, stusb160x_of_match); static int stusb160x_probe(struct i2c_client *client) { + const struct regmap_config *regmap_config; struct stusb160x *chip; - const struct of_device_id *match; - struct regmap_config *regmap_config; struct fwnode_handle *fwnode; int ret; @@ -645,8 +644,8 @@ static int stusb160x_probe(struct i2c_client *client) i2c_set_clientdata(client, chip); - match = i2c_of_match_device(stusb160x_of_match, client); - regmap_config = (struct regmap_config *)match->data; + regmap_config = i2c_get_match_data(client); + chip->regmap = devm_regmap_init_i2c(client, regmap_config); if (IS_ERR(chip->regmap)) { ret = PTR_ERR(chip->regmap);
Get matching data in one step by switching to use i2c_get_match_data(). As a positive side effect the matching data is qualified as a constant. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: fixed rebase issue which led to the compilation error (LKP) drivers/usb/typec/stusb160x.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)