Magicbox CF driver cleanup

SVN-Revision: 16925

diff --git a/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch b/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
index 4d396bcdca373c47c96f44d60a6d6575d7a46109..ebd9b339e9094431d3f65be2e98420e217c3b036 100644 (file)
--- a/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
+++ b/target/linux/ppc40x/patches-2.6.30/100-magicbox-ide-driver.patch
@@ -24,7 +24,7 @@
  obj-$(CONFIG_BLK_DEV_IDE_TX4939)      += tx4939ide.o
 --- /dev/null
 +++ b/drivers/ide/magicbox_ide.c
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,293 @@
 +/*
 + *  IDE driver for the MagicBox 2.0 onboard CompactFlash slot.
 + *
@@ -44,8 +44,6 @@
 +#include <linux/of_platform.h>
 +#include <linux/ide.h>
 +
-+#include <asm/dcr-native.h>
-+
 +#define DRV_DESC      "IDE driver for Magicbox 2.0 onboard CF slot"
 +#define DRV_NAME      "magicbox_cf"
 +
@@ -239,6 +237,9 @@
 +       * with CS1 active instead of CS0
 +       */
 +      hw->io_ports.ctl_addr = (unsigned long)ctrl + (6 * 2);
++      hw->irq = irq;
++      hw->chipset = ide_generic;
++      hw->ack_intr = NULL;
 +}
 +
 +static int __devinit magicbox_ide_of_probe(struct of_device *op,
@@ -271,12 +272,8 @@
 +              goto err_unmap_base;
 +      }
 +
-+      magicbox_ide_setup_hw(&hw, base, ctrl, irq);
-+
 +      hw.dev = &op->dev;
-+      hw.irq = irq;
-+      hw.chipset = ide_generic;
-+      hw.ack_intr = NULL;
++      magicbox_ide_setup_hw(&hw, base, ctrl, irq);
 +
 +      ret = ide_host_add(&magicbox_ide_port_info, hws, &host);
 +      if (ret)