Date: Tue, 16 Jun 2009 10:17:10 -0700
From: Greg KH <gregkh@suse.de>
To: Jesse Barnes <jesse.barnes@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
       Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 45/64] PCIE: remove driver_data direct access of struct
	device
Message-ID: <20090616171710.GA27808@suse.de>
References: <20090616051351.GA23627@kroah.com> <1245131213-24168-45-git-send-email-gregkh@suse.de> <20090616101311.747a3f19@jbarnes-g45>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090616101311.747a3f19@jbarnes-g45>
User-Agent: Mutt/1.5.19 (2009-01-05)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1883
Lines: 47

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-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/