diff options
| -rw-r--r-- | drivers/firewire/fw-device-cdev.c | 12 | ||||
| -rw-r--r-- | drivers/firewire/fw-device-cdev.h | 4 | ||||
| -rw-r--r-- | drivers/firewire/fw-iso.c | 8 | ||||
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 4 | ||||
| -rw-r--r-- | drivers/firewire/fw-transaction.h | 8 |
5 files changed, 16 insertions, 20 deletions
diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c index 1101ccd9b9c..b738c997ef3 100644 --- a/drivers/firewire/fw-device-cdev.c +++ b/drivers/firewire/fw-device-cdev.c @@ -503,15 +503,15 @@ static int ioctl_queue_iso(struct client *client, void __user *arg) return count; } -static int ioctl_send_iso(struct client *client, void __user *arg) +static int ioctl_start_iso(struct client *client, void __user *arg) { - struct fw_cdev_send_iso request; + struct fw_cdev_start_iso request; if (copy_from_user(&request, arg, sizeof request)) return -EFAULT; - return fw_iso_context_send(client->iso_context, request.channel, - request.speed, request.cycle); + return fw_iso_context_start(client->iso_context, request.channel, + request.speed, request.cycle); } static int @@ -530,8 +530,8 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg) return ioctl_create_iso_context(client, arg); case FW_CDEV_IOC_QUEUE_ISO: return ioctl_queue_iso(client, arg); - case FW_CDEV_IOC_SEND_ISO: - return ioctl_send_iso(client, arg); + case FW_CDEV_IOC_START_ISO: + return ioctl_start_iso(client, arg); default: return -EINVAL; } diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h index 4e766ec6cd3..ac91ce501bf 100644 --- a/drivers/firewire/fw-device-cdev.h +++ b/drivers/firewire/fw-device-cdev.h @@ -97,7 +97,7 @@ struct fw_cdev_event_iso_interrupt { #define FW_CDEV_IOC_SEND_RESPONSE _IO('#', 0x03) #define FW_CDEV_IOC_CREATE_ISO_CONTEXT _IO('#', 0x04) #define FW_CDEV_IOC_QUEUE_ISO _IO('#', 0x05) -#define FW_CDEV_IOC_SEND_ISO _IO('#', 0x06) +#define FW_CDEV_IOC_START_ISO _IO('#', 0x06) struct fw_cdev_get_config_rom { __u32 length; @@ -150,7 +150,7 @@ struct fw_cdev_queue_iso { __u64 data; }; -struct fw_cdev_send_iso { +struct fw_cdev_start_iso { __u32 channel; __u32 speed; __s32 cycle; diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c index 4c6dc99a1ff..d84792fe619 100644 --- a/drivers/firewire/fw-iso.c +++ b/drivers/firewire/fw-iso.c @@ -134,15 +134,15 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx) EXPORT_SYMBOL(fw_iso_context_destroy); int -fw_iso_context_send(struct fw_iso_context *ctx, - int channel, int speed, int cycle) +fw_iso_context_start(struct fw_iso_context *ctx, + int channel, int speed, int cycle) { ctx->channel = channel; ctx->speed = speed; - return ctx->card->driver->send_iso(ctx, cycle); + return ctx->card->driver->start_iso(ctx, cycle); } -EXPORT_SYMBOL(fw_iso_context_send); +EXPORT_SYMBOL(fw_iso_context_start); int fw_iso_context_queue(struct fw_iso_context *ctx, diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 90db5a4f3ae..faa384426a1 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c @@ -1350,7 +1350,7 @@ ohci_allocate_iso_context(struct fw_card *card, int type) return &ctx->base; } -static int ohci_send_iso(struct fw_iso_context *base, s32 cycle) +static int ohci_start_iso(struct fw_iso_context *base, s32 cycle) { struct iso_context *ctx = container_of(base, struct iso_context, base); struct fw_ohci *ohci = ctx->context.ohci; @@ -1594,7 +1594,7 @@ static const struct fw_card_driver ohci_driver = { .allocate_iso_context = ohci_allocate_iso_context, .free_iso_context = ohci_free_iso_context, .queue_iso = ohci_queue_iso, - .send_iso = ohci_send_iso, + .start_iso = ohci_start_iso, }; static int software_reset(struct fw_ohci *ohci) diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index 9e92edad68d..9ccbed80ceb 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h @@ -376,10 +376,6 @@ fw_iso_context_create(struct fw_card *card, int type, size_t header_size, void fw_iso_context_destroy(struct fw_iso_context *ctx); -void -fw_iso_context_start(struct fw_iso_context *ctx, - int channel, int speed, int cycle); - int fw_iso_context_queue(struct fw_iso_context *ctx, struct fw_iso_packet *packet, @@ -387,7 +383,7 @@ fw_iso_context_queue(struct fw_iso_context *ctx, unsigned long payload); int -fw_iso_context_send(struct fw_iso_context *ctx, +fw_iso_context_start(struct fw_iso_context *ctx, int channel, int speed, int cycle); struct fw_card_driver { @@ -426,7 +422,7 @@ struct fw_card_driver { (*allocate_iso_context)(struct fw_card *card, int type); void (*free_iso_context)(struct fw_iso_context *ctx); - int (*send_iso)(struct fw_iso_context *ctx, s32 cycle); + int (*start_iso)(struct fw_iso_context *ctx, s32 cycle); int (*queue_iso)(struct fw_iso_context *ctx, struct fw_iso_packet *packet, |