Skip to content

Commit

Permalink
[S390] cio: css_driver: Use consistent parameters.
Browse files Browse the repository at this point in the history 
Make all callbacks in css_driver take a struct subchannel (and not
a struct device).

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Cornelia Huck authored and Martin Schwidefsky committed Jan 26, 2008
1 parent 084325d commit 602b20f
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 48 deletions.
16 changes: 8 additions & 8 deletions drivers/s390/cio/chsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static void terminate_internal_io(struct subchannel *sch)
device_set_intretry(sch);
/* Call handler. */
if (sch->driver && sch->driver->termination)
sch->driver->termination(&sch->dev);
sch->driver->termination(sch);
}

static int
Expand Down Expand Up @@ -172,12 +172,12 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
terminate_internal_io(sch);
/* Re-start path verification. */
if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);
}
} else {
/* trigger path verification. */
if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);
else if (sch->lpm == mask)
goto out_unreg;
}
Expand Down Expand Up @@ -279,7 +279,7 @@ __s390_process_res_acc(struct subchannel_id schid, void *data)
if (!old_lpm && sch->lpm)
device_trigger_reprobe(sch);
else if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);
out:
spin_unlock_irq(sch->lock);
put_device(&sch->dev);
Expand Down Expand Up @@ -549,7 +549,7 @@ __chp_add(struct subchannel_id schid, void *data)
| mask) & sch->opm;

if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);

spin_unlock_irq(sch->lock);
put_device(&sch->dev);
Expand Down Expand Up @@ -589,7 +589,7 @@ static void __s390_subchannel_vary_chpid(struct subchannel *sch,
if (!old_lpm)
device_trigger_reprobe(sch);
else if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);
break;
}
sch->opm &= ~mask;
Expand All @@ -603,13 +603,13 @@ static void __s390_subchannel_vary_chpid(struct subchannel *sch,
terminate_internal_io(sch);
/* Re-start path verification. */
if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);
}
} else if (!sch->lpm) {
if (device_trigger_verify(sch) != 0)
css_schedule_eval(sch->schid);
} else if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev);
sch->driver->verify(sch);
break;
}
spin_unlock_irqrestore(sch->lock, flags);
Expand Down
4 changes: 2 additions & 2 deletions drivers/s390/cio/cio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ cio_tpi(void)
spin_lock(sch->lock);
memcpy (&sch->schib.scsw, &irb->scsw, sizeof (struct scsw));
if (sch->driver && sch->driver->irq)
sch->driver->irq(&sch->dev);
sch->driver->irq(sch);
spin_unlock(sch->lock);
irq_exit ();
_local_bh_enable();
Expand Down Expand Up @@ -680,7 +680,7 @@ do_IRQ (struct pt_regs *regs)
sizeof (irb->scsw));
/* Call interrupt handler if there is one. */
if (sch->driver && sch->driver->irq)
sch->driver->irq(&sch->dev);
sch->driver->irq(sch);
}
if (sch)
spin_unlock(sch->lock);
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/cio/css.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int css_evaluate_known_subchannel(struct subchannel *sch, int slow)
action = UNREGISTER;
if (sch->driver && sch->driver->notify) {
spin_unlock_irqrestore(sch->lock, flags);
ret = sch->driver->notify(&sch->dev, event);
ret = sch->driver->notify(sch, event);
spin_lock_irqsave(sch->lock, flags);
if (ret)
action = NONE;
Expand Down
8 changes: 4 additions & 4 deletions drivers/s390/cio/css.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ struct subchannel;
struct css_driver {
unsigned int subchannel_type;
struct device_driver drv;
void (*irq)(struct device *);
int (*notify)(struct device *, int);
void (*verify)(struct device *);
void (*termination)(struct device *);
void (*irq)(struct subchannel *);
int (*notify)(struct subchannel *, int);
void (*verify)(struct subchannel *);
void (*termination)(struct subchannel *);
int (*probe)(struct subchannel *);
int (*remove)(struct subchannel *);
void (*shutdown)(struct subchannel *);
Expand Down
38 changes: 24 additions & 14 deletions drivers/s390/cio/device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,12 @@ static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env)

struct bus_type ccw_bus_type;

static int io_subchannel_probe (struct subchannel *);
static int io_subchannel_remove (struct subchannel *);
static int io_subchannel_notify(struct device *, int);
static void io_subchannel_verify(struct device *);
static void io_subchannel_ioterm(struct device *);
static void io_subchannel_irq(struct subchannel *);
static int io_subchannel_probe(struct subchannel *);
static int io_subchannel_remove(struct subchannel *);
static int io_subchannel_notify(struct subchannel *, int);
static void io_subchannel_verify(struct subchannel *);
static void io_subchannel_ioterm(struct subchannel *);
static void io_subchannel_shutdown(struct subchannel *);

static struct css_driver io_subchannel_driver = {
Expand Down Expand Up @@ -1096,6 +1097,18 @@ static void ccw_device_move_to_sch(struct work_struct *work)
put_device(&cdev->dev);
}

static void io_subchannel_irq(struct subchannel *sch)
{
struct ccw_device *cdev;

cdev = sch->dev.driver_data;

CIO_TRACE_EVENT(3, "IRQ");
CIO_TRACE_EVENT(3, sch->dev.bus_id);
if (cdev)
dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
}

static int
io_subchannel_probe (struct subchannel *sch)
{
Expand Down Expand Up @@ -1183,12 +1196,11 @@ io_subchannel_remove (struct subchannel *sch)
return 0;
}

static int
io_subchannel_notify(struct device *dev, int event)
static int io_subchannel_notify(struct subchannel *sch, int event)
{
struct ccw_device *cdev;

cdev = dev->driver_data;
cdev = sch->dev.driver_data;
if (!cdev)
return 0;
if (!cdev->drv)
Expand All @@ -1198,22 +1210,20 @@ io_subchannel_notify(struct device *dev, int event)
return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
}

static void
io_subchannel_verify(struct device *dev)
static void io_subchannel_verify(struct subchannel *sch)
{
struct ccw_device *cdev;

cdev = dev->driver_data;
cdev = sch->dev.driver_data;
if (cdev)
dev_fsm_event(cdev, DEV_EVENT_VERIFY);
}

static void
io_subchannel_ioterm(struct device *dev)
static void io_subchannel_ioterm(struct subchannel *sch)
{
struct ccw_device *cdev;

cdev = dev->driver_data;
cdev = sch->dev.driver_data;
if (!cdev)
return;
/* Internal I/O will be retried by the interrupt handler. */
Expand Down
1 change: 0 additions & 1 deletion drivers/s390/cio/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ extern struct workqueue_struct *ccw_device_notify_work;
extern wait_queue_head_t ccw_device_init_wq;
extern atomic_t ccw_device_init_count;

void io_subchannel_irq (struct device *pdev);
void io_subchannel_recog_done(struct ccw_device *cdev);

int ccw_device_cancel_halt_clear(struct ccw_device *);
Expand Down
19 changes: 1 addition & 18 deletions drivers/s390/cio/device_fsm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ ccw_device_oper_notify(struct work_struct *work)
sch = to_subchannel(cdev->dev.parent);
if (sch->driver && sch->driver->notify) {
spin_unlock_irqrestore(cdev->ccwlock, flags);
ret = sch->driver->notify(&sch->dev, CIO_OPER);
ret = sch->driver->notify(sch, CIO_OPER);
spin_lock_irqsave(cdev->ccwlock, flags);
} else
ret = 0;
Expand Down Expand Up @@ -1273,21 +1273,4 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
},
};

/*
* io_subchannel_irq is called for "real" interrupts or for status
* pending conditions on msch.
*/
void
io_subchannel_irq (struct device *pdev)
{
struct ccw_device *cdev;

cdev = to_subchannel(pdev)->dev.driver_data;

CIO_TRACE_EVENT (3, "IRQ");
CIO_TRACE_EVENT (3, pdev->bus_id);
if (cdev)
dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
}

EXPORT_SYMBOL_GPL(ccw_device_set_timeout);

0 comments on commit 602b20f

Please sign in to comment.