[Cbe-oss-dev] ps3-replace-irq-alloc-free.diff missing changes on PS3 storage

[Hiroyuki Machida]

Hi Geoff,

I pulled ps3-linux git tree yesterday, but I could not compile it
using defaul t config
for ps3.  I think you forgot to commit  somehing like following with
"ps3-replace-irq-alloc-free.diff"

ps3-stor-eventif.patch
Signed-off-by:Hiroyuki Machida <Hiroyuki.Machida at jp.sony.com>


diff --git a/drivers/block/ps3_storage.c b/drivers/block/ps3_storage.c
index fed21a9..5190fea 100644
--- a/drivers/block/ps3_storage.c
+++ b/drivers/block/ps3_storage.c
@@ -1522,12 +1522,12 @@ static int is_region_accessible(struct
ps3_stor_lv1_dev_info * lv1_dev_info,
 	if (error)
 		return 0;

-	error = ps3_connect_event_irq(PS3_BINDING_CPU_ANY,
+	error = ps3_sb_event_receive_port_setup(PS3_BINDING_CPU_ANY,
 				      &lv1_dev_info->repo.did,
 				      lv1_dev_info->interrupt_id,
 				      &irq_plug_id);
 	if (error) {
-		printk("%s:%u: ps3_connect_event_irq failed (%d)\n", __func__,
+		printk("%s:%u: ps3_sb_event_receive_port_setup failed (%d)\n", __func__,
 		       __LINE__, error);
 		goto fail_close_device;
 	}
@@ -1581,7 +1581,7 @@ fail_free_dma_region:
 fail_free_irq:
 	free_irq(irq_plug_id, &info);
 fail_disconnect_event_irq:
-	ps3_disconnect_event_irq(&lv1_dev_info->repo.did,
+	ps3_sb_event_receive_port_destroy(&lv1_dev_info->repo.did,
 				 lv1_dev_info->interrupt_id, irq_plug_id);
 fail_close_device:
 	lv1_close_device(lv1_dev_info->repo.did.bus_id,
@@ -2144,12 +2144,12 @@ static int ps3_stor_slave_alloc(struct
scsi_device * scsi_dev)
 		goto out;
 	}

-	error = ps3_connect_event_irq(PS3_BINDING_CPU_ANY,
+	error = ps3_sb_event_receive_port_setup(PS3_BINDING_CPU_ANY,
 				      &lv1_dev_info->repo.did /* host_info->dev.did */,
 				      lv1_dev_info->interrupt_id,
 				      &lv1_dev_info->irq_plug_id);
 	if (error) {
-		printk("%s:%u: ps3_connect_event_irq failed (%d)\n", __func__,
+		printk("%s:%u: ps3_sb_event_receive_port_setup failed (%d)\n", __func__,
 		       __LINE__, error);
 		error = -EPERM;
 		goto fail_close_device;
@@ -2273,7 +2273,7 @@ fail_free_irq:
 	free_irq(lv1_dev_info->irq_plug_id, lv1_dev_info);
 fail_disconnect_event_irq:
 	FUNC_STEP_C("6");
-	ps3_disconnect_event_irq(&lv1_dev_info->repo.did,
+	ps3_sb_event_receive_port_destroy(&lv1_dev_info->repo.did,
 				 lv1_dev_info->interrupt_id,
 				 lv1_dev_info->irq_plug_id);
 fail_close_device:
@@ -2363,7 +2363,7 @@ static void ps3_stor_slave_destroy(struct
scsi_device * scsi_dev)

 	free_irq(lv1_dev_info->irq_plug_id, lv1_dev_info);

-	ps3_disconnect_event_irq(&lv1_dev_info->repo.did,
+	ps3_sb_event_receive_port_destroy(&lv1_dev_info->repo.did,
 				 lv1_dev_info->interrupt_id,
 				 lv1_dev_info->irq_plug_id);
 	if (error)