1 files changed, 5 insertions, 171 deletions

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 1dadd5a15ba1..336e5ff4cfcf 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -98,21 +98,6 @@ static struct hpsb_address_ops arm_ops = {
 
 static void queue_complete_cb(struct pending_request *req);
 
-#include <asm/current.h>
-static void print_old_iso_deprecation(void)
-{
-        static pid_t p;
-
-        if (p == current->pid)
-                return;
-        p = current->pid;
-        printk(KERN_WARNING "raw1394: WARNING - Program \"%s\" uses unsupported"
-               " isochronous request types which will be removed in a next"
-               " kernel release\n", current->comm);
-        printk(KERN_WARNING "raw1394: Update your software to use libraw1394's"
-               " newer interface\n");
-}
-
 static struct pending_request *__alloc_pending_request(gfp_t flags)
 {
         struct pending_request *req;
@@ -297,67 +282,6 @@ static void host_reset(struct hpsb_host *host)
         spin_unlock_irqrestore(&host_info_lock, flags);
 }
 
-static void iso_receive(struct hpsb_host *host, int channel, quadlet_t * data,
-                        size_t length)
-{
-        unsigned long flags;
-        struct host_info *hi;
-        struct file_info *fi;
-        struct pending_request *req, *req_next;
-        struct iso_block_store *ibs = NULL;
-        LIST_HEAD(reqs);
-
-        if ((atomic_read(&iso_buffer_size) + length) > iso_buffer_max) {
-                HPSB_INFO("dropped iso packet");
-                return;
-        }
-
-        spin_lock_irqsave(&host_info_lock, flags);
-        hi = find_host_info(host);
-
-        if (hi != NULL) {
-                list_for_each_entry(fi, &hi->file_info_list, list) {
-                        if (!(fi->listen_channels & (1ULL << channel)))
-                                continue;
-
-                        req = __alloc_pending_request(GFP_ATOMIC);
-                        if (!req)
-                                break;
-
-                        if (!ibs) {
-                                ibs = kmalloc(sizeof(*ibs) + length,
-                                              GFP_ATOMIC);
-                                if (!ibs) {
-                                        kfree(req);
-                                        break;
-                                }
-
-                                atomic_add(length, &iso_buffer_size);
-                                atomic_set(&ibs->refcount, 0);
-                                ibs->data_size = length;
-                                memcpy(ibs->data, data, length);
-                        }
-
-                        atomic_inc(&ibs->refcount);
-
-                        req->file_info = fi;
-                        req->ibs = ibs;
-                        req->data = ibs->data;
-                        req->req.type = RAW1394_REQ_ISO_RECEIVE;
-                        req->req.generation = get_hpsb_generation(host);
-                        req->req.misc = 0;
-                        req->req.recvb = ptr2int(fi->iso_buffer);
-                        req->req.length = min(length, fi->iso_buffer_length);
-
-                        list_add_tail(&req->list, &reqs);
-                }
-        }
-        spin_unlock_irqrestore(&host_info_lock, flags);
-
-        list_for_each_entry_safe(req, req_next, &reqs, list)
-            queue_complete_req(req);
-}
-
 static void fcp_request(struct hpsb_host *host, int nodeid, int direction,
                         int cts, u8 * data, size_t length)
 {
@@ -680,43 +604,6 @@ out_set_card:
         return 0;
 }
 
-static void handle_iso_listen(struct file_info *fi, struct pending_request *req)
-{
-        int channel = req->req.misc;
-
-        if ((channel > 63) || (channel < -64)) {
-                req->req.error = RAW1394_ERROR_INVALID_ARG;
-        } else if (channel >= 0) {
-                /* allocate channel req.misc */
-                if (fi->listen_channels & (1ULL << channel)) {
-                        req->req.error = RAW1394_ERROR_ALREADY;
-                } else {
-                        if (hpsb_listen_channel
-                            (&raw1394_highlevel, fi->host, channel)) {
-                                req->req.error = RAW1394_ERROR_ALREADY;
-                        } else {
-                                fi->listen_channels |= 1ULL << channel;
-                                fi->iso_buffer = int2ptr(req->req.recvb);
-                                fi->iso_buffer_length = req->req.length;
-                        }
-                }
-        } else {
-                /* deallocate channel (one's complement neg) req.misc */
-                channel = ~channel;
-
-                if (fi->listen_channels & (1ULL << channel)) {
-                        hpsb_unlisten_channel(&raw1394_highlevel, fi->host,
-                                              channel);
-                        fi->listen_channels &= ~(1ULL << channel);
-                } else {
-                        req->req.error = RAW1394_ERROR_INVALID_ARG;
-                }
-        }
-
-        req->req.length = 0;
-        queue_complete_req(req);
-}
-
 static void handle_fcp_listen(struct file_info *fi, struct pending_request *req)
 {
         if (req->req.misc) {
@@ -890,50 +777,6 @@ static int handle_async_request(struct file_info *fi,
         return 0;
 }
 
-static int handle_iso_send(struct file_info *fi, struct pending_request *req,
-                           int channel)
-{
-        unsigned long flags;
-        struct hpsb_packet *packet;
-
-        packet = hpsb_make_isopacket(fi->host, req->req.length, channel & 0x3f,
-                                     (req->req.misc >> 16) & 0x3,
-                                     req->req.misc & 0xf);
-        if (!packet)
-                return -ENOMEM;
-
-        packet->speed_code = req->req.address & 0x3;
-
-        req->packet = packet;
-
-        if (copy_from_user(packet->data, int2ptr(req->req.sendb),
-                           req->req.length)) {
-                req->req.error = RAW1394_ERROR_MEMFAULT;
-                req->req.length = 0;
-                queue_complete_req(req);
-                return 0;
-        }
-
-        req->req.length = 0;
-        hpsb_set_packet_complete_task(packet,
-                                      (void (*)(void *))queue_complete_req,
-                                      req);
-
-        spin_lock_irqsave(&fi->reqlists_lock, flags);
-        list_add_tail(&req->list, &fi->req_pending);
-        spin_unlock_irqrestore(&fi->reqlists_lock, flags);
-
-        /* Update the generation of the packet just before sending. */
-        packet->generation = req->req.generation;
-
-        if (hpsb_send_packet(packet) < 0) {
-                req->req.error = RAW1394_ERROR_SEND_ERROR;
-                queue_complete_req(req);
-        }
-
-        return 0;
-}
-
 static int handle_async_send(struct file_info *fi, struct pending_request *req)
 {
         unsigned long flags;
@@ -2317,10 +2160,6 @@ static int state_connected(struct file_info *fi, struct pending_request *req)
                 queue_complete_req(req);
                 return 0;
 
-        case RAW1394_REQ_ISO_SEND:
-                print_old_iso_deprecation();
-                return handle_iso_send(fi, req, node);
-
         case RAW1394_REQ_ARM_REGISTER:
                 return arm_register(fi, req);
 
@@ -2336,9 +2175,12 @@ static int state_connected(struct file_info *fi, struct pending_request *req)
         case RAW1394_REQ_RESET_NOTIFY:
                 return reset_notification(fi, req);
 
+        case RAW1394_REQ_ISO_SEND:
         case RAW1394_REQ_ISO_LISTEN:
-                print_old_iso_deprecation();
-                handle_iso_listen(fi, req);
+                printk(KERN_DEBUG "raw1394: old iso ABI has been removed\n");
+                req->req.error = RAW1394_ERROR_COMPAT;
+                req->req.misc = RAW1394_KERNELAPI_VERSION;
+                queue_complete_req(req);
                 return 0;
 
         case RAW1394_REQ_FCP_LISTEN:
@@ -2965,14 +2807,7 @@ static int raw1394_release(struct inode *inode, struct file *file)
         if (fi->iso_state != RAW1394_ISO_INACTIVE)
                 raw1394_iso_shutdown(fi);
 
-        for (i = 0; i < 64; i++) {
-                if (fi->listen_channels & (1ULL << i)) {
-                        hpsb_unlisten_channel(&raw1394_highlevel, fi->host, i);
-                }
-        }
-
         spin_lock_irqsave(&host_info_lock, flags);
-        fi->listen_channels = 0;
 
         fail = 0;
         /* set address-entries invalid */
@@ -3134,7 +2969,6 @@ static struct hpsb_highlevel raw1394_highlevel = {
         .add_host = add_host,
         .remove_host = remove_host,
         .host_reset = host_reset,
-        .iso_receive = iso_receive,
         .fcp_request = fcp_request,
 };