| Message ID | 1245131213-24168-45-git-send-email-gregkh@suse.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, 15 Jun 2009 22:46:34 -0700 Greg Kroah-Hartman <gregkh@suse.de> wrote: > In the near future, the driver core is going to not allow direct > access to the driver_data pointer in struct device. Instead, the > functions dev_get_drvdata() and dev_set_drvdata() should be used. > These functions have been around since the beginning, so are > backwards compatible with all older kernel versions. > > > Cc: linux-pci@vger.kernel.org > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > --- > drivers/pci/pcie/portdrv_core.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/pci/pcie/portdrv_core.c > b/drivers/pci/pcie/portdrv_core.c index e399825..13ffdc3 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -275,7 +275,7 @@ static void pcie_device_init(struct pci_dev > *parent, struct pcie_device *dev, memset(device, 0, sizeof(struct > device)); device->bus = &pcie_port_bus_type; > device->driver = NULL; > - device->driver_data = NULL; > + dev_set_drvdata(device, NULL); > device->release = release_pcie_device; /* callback to > free pcie dev */ dev_set_name(device, "%s:pcie%02x", > pci_name(parent), get_descriptor_id(port_type, > service_type)); Looks like I already have this one in my linux-next branch, but I think Linus will handle any conflict that arises if this ends up coming from both of us. Thanks,
On Tue, Jun 16, 2009 at 10:13:11AM -0700, Jesse Barnes wrote: > On Mon, 15 Jun 2009 22:46:34 -0700 > Greg Kroah-Hartman <gregkh@suse.de> wrote: > > > In the near future, the driver core is going to not allow direct > > access to the driver_data pointer in struct device. Instead, the > > functions dev_get_drvdata() and dev_set_drvdata() should be used. > > These functions have been around since the beginning, so are > > backwards compatible with all older kernel versions. > > > > > > Cc: linux-pci@vger.kernel.org > > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > > --- > > drivers/pci/pcie/portdrv_core.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/pci/pcie/portdrv_core.c > > b/drivers/pci/pcie/portdrv_core.c index e399825..13ffdc3 100644 > > --- a/drivers/pci/pcie/portdrv_core.c > > +++ b/drivers/pci/pcie/portdrv_core.c > > @@ -275,7 +275,7 @@ static void pcie_device_init(struct pci_dev > > *parent, struct pcie_device *dev, memset(device, 0, sizeof(struct > > device)); device->bus = &pcie_port_bus_type; > > device->driver = NULL; > > - device->driver_data = NULL; > > + dev_set_drvdata(device, NULL); > > device->release = release_pcie_device; /* callback to > > free pcie dev */ dev_set_name(device, "%s:pcie%02x", > > pci_name(parent), get_descriptor_id(port_type, > > service_type)); > > Looks like I already have this one in my linux-next branch, but I think > Linus will handle any conflict that arises if this ends up coming from > both of us. Yes, it should be a trivial merge. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index e399825..13ffdc3 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -275,7 +275,7 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev, memset(device, 0, sizeof(struct device)); device->bus = &pcie_port_bus_type; device->driver = NULL; - device->driver_data = NULL; + dev_set_drvdata(device, NULL); device->release = release_pcie_device; /* callback to free pcie dev */ dev_set_name(device, "%s:pcie%02x", pci_name(parent), get_descriptor_id(port_type, service_type));
In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions. Cc: linux-pci@vger.kernel.org Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/pci/pcie/portdrv_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)