mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
[S390] driver_data access
Replace the remaining direct accesses to the driver_data pointer with calls to the dev_get_drvdata() and dev_set_drvdata() functions. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
parent
4a9c75255e
commit
4f0076f77f
7 changed files with 13 additions and 13 deletions
|
@ -732,7 +732,7 @@ static int raw3215_pm_stop(struct ccw_device *cdev)
|
|||
unsigned long flags;
|
||||
|
||||
/* Empty the output buffer, then prevent new I/O. */
|
||||
raw = cdev->dev.driver_data;
|
||||
raw = dev_get_drvdata(&cdev->dev);
|
||||
spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
|
||||
raw3215_make_room(raw, RAW3215_BUFFER_SIZE);
|
||||
raw->flags |= RAW3215_FROZEN;
|
||||
|
@ -746,7 +746,7 @@ static int raw3215_pm_start(struct ccw_device *cdev)
|
|||
unsigned long flags;
|
||||
|
||||
/* Allow I/O again and flush output buffer. */
|
||||
raw = cdev->dev.driver_data;
|
||||
raw = dev_get_drvdata(&cdev->dev);
|
||||
spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
|
||||
raw->flags &= ~RAW3215_FROZEN;
|
||||
raw->flags |= RAW3215_FLUSHING;
|
||||
|
|
|
@ -320,7 +320,7 @@ static int mon_open(struct inode *inode, struct file *filp)
|
|||
goto out_path;
|
||||
}
|
||||
filp->private_data = monpriv;
|
||||
monreader_device->driver_data = monpriv;
|
||||
dev_set_drvdata(&monreader_device, monpriv);
|
||||
unlock_kernel();
|
||||
return nonseekable_open(inode, filp);
|
||||
|
||||
|
@ -463,7 +463,7 @@ static struct miscdevice mon_dev = {
|
|||
*****************************************************************************/
|
||||
static int monreader_freeze(struct device *dev)
|
||||
{
|
||||
struct mon_private *monpriv = dev->driver_data;
|
||||
struct mon_private *monpriv = dev_get_drvdata(&dev);
|
||||
int rc;
|
||||
|
||||
if (!monpriv)
|
||||
|
@ -487,7 +487,7 @@ static int monreader_freeze(struct device *dev)
|
|||
|
||||
static int monreader_thaw(struct device *dev)
|
||||
{
|
||||
struct mon_private *monpriv = dev->driver_data;
|
||||
struct mon_private *monpriv = dev_get_drvdata(dev);
|
||||
int rc;
|
||||
|
||||
if (!monpriv)
|
||||
|
|
|
@ -1322,7 +1322,7 @@ static int raw3270_pm_stop(struct ccw_device *cdev)
|
|||
struct raw3270_view *view;
|
||||
unsigned long flags;
|
||||
|
||||
rp = cdev->dev.driver_data;
|
||||
rp = dev_get_drvdata(&cdev->dev);
|
||||
if (!rp)
|
||||
return 0;
|
||||
spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);
|
||||
|
@ -1348,7 +1348,7 @@ static int raw3270_pm_start(struct ccw_device *cdev)
|
|||
struct raw3270 *rp;
|
||||
unsigned long flags;
|
||||
|
||||
rp = cdev->dev.driver_data;
|
||||
rp = dev_get_drvdata(&cdev->dev);
|
||||
if (!rp)
|
||||
return 0;
|
||||
spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);
|
||||
|
|
|
@ -396,7 +396,7 @@ int tape_generic_pm_suspend(struct ccw_device *cdev)
|
|||
{
|
||||
struct tape_device *device;
|
||||
|
||||
device = cdev->dev.driver_data;
|
||||
device = dev_get_drvdata(&cdev->dev);
|
||||
if (!device) {
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
@ -663,7 +663,7 @@ static struct attribute *vmlogrdr_attrs[] = {
|
|||
static int vmlogrdr_pm_prepare(struct device *dev)
|
||||
{
|
||||
int rc;
|
||||
struct vmlogrdr_priv_t *priv = dev->driver_data;
|
||||
struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
|
||||
|
||||
rc = 0;
|
||||
if (priv) {
|
||||
|
@ -753,7 +753,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
|
|||
dev->bus = &iucv_bus;
|
||||
dev->parent = iucv_root;
|
||||
dev->driver = &vmlogrdr_driver;
|
||||
dev->driver_data = priv;
|
||||
dev_set_drvdata(dev, priv);
|
||||
/*
|
||||
* The release function could be called after the
|
||||
* module has been unloaded. It's _only_ task is to
|
||||
|
|
|
@ -170,7 +170,7 @@ static void urdev_put(struct urdev *urd)
|
|||
*/
|
||||
static int ur_pm_suspend(struct ccw_device *cdev)
|
||||
{
|
||||
struct urdev *urd = cdev->dev.driver_data;
|
||||
struct urdev *urd = dev_get_drvdata(&cdev->dev);
|
||||
|
||||
TRACE("ur_pm_suspend: cdev=%p\n", cdev);
|
||||
if (urd->open_flag) {
|
||||
|
|
|
@ -1307,7 +1307,7 @@ static void netiucv_pm_complete(struct device *dev)
|
|||
*/
|
||||
static int netiucv_pm_freeze(struct device *dev)
|
||||
{
|
||||
struct netiucv_priv *priv = dev->driver_data;
|
||||
struct netiucv_priv *priv = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = NULL;
|
||||
int rc = 0;
|
||||
|
||||
|
@ -1331,7 +1331,7 @@ static int netiucv_pm_freeze(struct device *dev)
|
|||
*/
|
||||
static int netiucv_pm_restore_thaw(struct device *dev)
|
||||
{
|
||||
struct netiucv_priv *priv = dev->driver_data;
|
||||
struct netiucv_priv *priv = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = NULL;
|
||||
int rc = 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue