Hello Greg, On Tue, Feb 25, 2025 at 04:32:50AM +0100, Greg Kroah-Hartman wrote: > On Tue, Feb 25, 2025 at 12:21:36AM +0100, Sebastian Reichel wrote: > > In order to remove .of_node from the power_supply_config struct, > > use .fwnode instead. > > > > Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx> > > --- > > drivers/usb/common/usb-conn-gpio.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c > > index aa710b50791b0282be0a6a26cffdd981b794acaa..1e36be2a28fd5ca5e1495b7923e4d3e25d7cedef 100644 > > --- a/drivers/usb/common/usb-conn-gpio.c > > +++ b/drivers/usb/common/usb-conn-gpio.c > > @@ -158,7 +158,7 @@ static int usb_conn_psy_register(struct usb_conn_info *info) > > struct device *dev = info->dev; > > struct power_supply_desc *desc = &info->desc; > > struct power_supply_config cfg = { > > - .of_node = dev->of_node, > > + .fwnode = dev_fwnode(dev), > > }; > > > > desc->name = "usb-charger"; > > > > -- > > 2.47.2 > > Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Please just merge this patch through the USB tree. There are no dependencies and I will send a new version for the later patches, but they won't make it to 6.15 as I want enough time in linux-next for them. This patch is rather simple and getting it merged now means we avoid immutable branches or merging through the wrong tree in the 6.16 cycle. Thanks, -- Sebastian
Attachment:
signature.asc
Description: PGP signature