| Message ID | 20240208-bus_cleanup-pci2-v1-1-5e578210b6f2@marliere.net |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: make pcie_port_bus_type const | expand |
On Thu, Feb 08, 2024 at 04:41:46PM -0300, Ricardo B. Marliere wrote: > Now that the driver core can properly handle constant struct bus_type, > move the pcie_port_bus_type variable to be a constant structure as well, > placing it into read-only memory which can not be modified at runtime. > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> Applied to pci/misc for v6.9, thanks! Subject line adjusted to: PCI: Make pcie_port_bus_type const to match history. > --- > drivers/pci/pci-driver.c | 2 +- > drivers/pci/pcie/portdrv.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index ec838f2e892e..a29098e24683 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -1705,7 +1705,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) > return 1; > } > > -struct bus_type pcie_port_bus_type = { > +const struct bus_type pcie_port_bus_type = { > .name = "pci_express", > .match = pcie_port_bus_match, > }; > diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h > index 1f3803bde7ee..12c89ea0313b 100644 > --- a/drivers/pci/pcie/portdrv.h > +++ b/drivers/pci/pcie/portdrv.h > @@ -96,7 +96,7 @@ struct pcie_port_service_driver { > int pcie_port_service_register(struct pcie_port_service_driver *new); > void pcie_port_service_unregister(struct pcie_port_service_driver *new); > > -extern struct bus_type pcie_port_bus_type; > +extern const struct bus_type pcie_port_bus_type; > > struct pci_dev; > > > --- > base-commit: cc24b2d080dca2ce1c89a8a71c00bdf21155f357 > change-id: 20240208-bus_cleanup-pci2-61fe9c495d08 > > Best regards, > -- > Ricardo B. Marliere <ricardo@marliere.net> >
Hi Bjorn, On 8 Feb 15:00, Bjorn Helgaas wrote: > On Thu, Feb 08, 2024 at 04:41:46PM -0300, Ricardo B. Marliere wrote: > > Now that the driver core can properly handle constant struct bus_type, > > move the pcie_port_bus_type variable to be a constant structure as well, > > placing it into read-only memory which can not be modified at runtime. > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> > > Applied to pci/misc for v6.9, thanks! > > Subject line adjusted to: > > PCI: Make pcie_port_bus_type const > > to match history. Noted, thanks! - Ricardo
On 2/8/24 11:41 AM, Ricardo B. Marliere wrote: > Now that the driver core can properly handle constant struct bus_type, > move the pcie_port_bus_type variable to be a constant structure as well, > placing it into read-only memory which can not be modified at runtime. > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> > --- Looks fine to me. Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> > drivers/pci/pci-driver.c | 2 +- > drivers/pci/pcie/portdrv.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index ec838f2e892e..a29098e24683 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -1705,7 +1705,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) > return 1; > } > > -struct bus_type pcie_port_bus_type = { > +const struct bus_type pcie_port_bus_type = { > .name = "pci_express", > .match = pcie_port_bus_match, > }; > diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h > index 1f3803bde7ee..12c89ea0313b 100644 > --- a/drivers/pci/pcie/portdrv.h > +++ b/drivers/pci/pcie/portdrv.h > @@ -96,7 +96,7 @@ struct pcie_port_service_driver { > int pcie_port_service_register(struct pcie_port_service_driver *new); > void pcie_port_service_unregister(struct pcie_port_service_driver *new); > > -extern struct bus_type pcie_port_bus_type; > +extern const struct bus_type pcie_port_bus_type; > > struct pci_dev; > > > --- > base-commit: cc24b2d080dca2ce1c89a8a71c00bdf21155f357 > change-id: 20240208-bus_cleanup-pci2-61fe9c495d08 > > Best regards,
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index ec838f2e892e..a29098e24683 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1705,7 +1705,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) return 1; } -struct bus_type pcie_port_bus_type = { +const struct bus_type pcie_port_bus_type = { .name = "pci_express", .match = pcie_port_bus_match, }; diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h index 1f3803bde7ee..12c89ea0313b 100644 --- a/drivers/pci/pcie/portdrv.h +++ b/drivers/pci/pcie/portdrv.h @@ -96,7 +96,7 @@ struct pcie_port_service_driver { int pcie_port_service_register(struct pcie_port_service_driver *new); void pcie_port_service_unregister(struct pcie_port_service_driver *new); -extern struct bus_type pcie_port_bus_type; +extern const struct bus_type pcie_port_bus_type; struct pci_dev;
Now that the driver core can properly handle constant struct bus_type, move the pcie_port_bus_type variable to be a constant structure as well, placing it into read-only memory which can not be modified at runtime. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> --- drivers/pci/pci-driver.c | 2 +- drivers/pci/pcie/portdrv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- base-commit: cc24b2d080dca2ce1c89a8a71c00bdf21155f357 change-id: 20240208-bus_cleanup-pci2-61fe9c495d08 Best regards,