* [PATCH 1/7] powerpc: Remove some of the legacy iSeries specifi device drivers
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
@ 2012-03-08 4:32 ` Stephen Rothwell
2012-03-08 4:33 ` [PATCH 2/7] net: powerpc: remove the legacy iSeries ethernet driver Stephen Rothwell
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:32 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Jens Axboe, ppc-dev, LKML
[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]
These drivers are specific to the PowerPC legacy iSeries platform and
their Kconfig is specified in arch/powerpc. Legacy iSeries is being
removed, so these drivers can no longer be selected.
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/viodasd.c | 809 ------------------------------------
drivers/cdrom/viocd.c | 739 ---------------------------------
drivers/char/viotape.c | 1041 -----------------------------------------------
3 files changed, 0 insertions(+), 2589 deletions(-)
delete mode 100644 drivers/block/viodasd.c
delete mode 100644 drivers/cdrom/viocd.c
delete mode 100644 drivers/char/viotape.c
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
deleted file mode 100644
index 9a5b2a2..0000000
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
deleted file mode 100644
index 7878da8..0000000
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
deleted file mode 100644
index ad6e64a..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/7] net: powerpc: remove the legacy iSeries ethernet driver
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
2012-03-08 4:32 ` [PATCH 1/7] powerpc: Remove some of the legacy iSeries specifi device drivers Stephen Rothwell
@ 2012-03-08 4:33 ` Stephen Rothwell
2012-03-08 6:53 ` David Miller
2012-03-08 4:35 ` [PATCH 3/7] [SCSI] powerpc: remove the legacy iSeries part of ibmvscsi Stephen Rothwell
` (7 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:33 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: netdev, ppc-dev, David Miller, LKML
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]
This driver is specific to the PowerPC legcay iSeries platform which is
being removed.
Cc: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/ibm/Kconfig | 4 -
drivers/net/ethernet/ibm/Makefile | 1 -
drivers/net/ethernet/ibm/iseries_veth.c | 1710 -------------------------------
3 files changed, 0 insertions(+), 1715 deletions(-)
delete mode 100644 drivers/net/ethernet/ibm/iseries_veth.c
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index 9e16f3f..b9773d2 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -29,10 +29,6 @@ config IBMVETH
To compile this driver as a module, choose M here. The module will
be called ibmveth.
-config ISERIES_VETH
- tristate "iSeries Virtual Ethernet driver support"
- depends on PPC_ISERIES
-
source "drivers/net/ethernet/ibm/emac/Kconfig"
config EHEA
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
index 5a7d4e9..2f04e71 100644
--- a/drivers/net/ethernet/ibm/Makefile
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -3,6 +3,5 @@
#
obj-$(CONFIG_IBMVETH) += ibmveth.o
-obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_IBM_EMAC) += emac/
obj-$(CONFIG_EHEA) += ehea/
diff --git a/drivers/net/ethernet/ibm/iseries_veth.c b/drivers/net/ethernet/ibm/iseries_veth.c
deleted file mode 100644
index acc31af..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/7] [SCSI] powerpc: remove the legacy iSeries part of ibmvscsi
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
2012-03-08 4:32 ` [PATCH 1/7] powerpc: Remove some of the legacy iSeries specifi device drivers Stephen Rothwell
2012-03-08 4:33 ` [PATCH 2/7] net: powerpc: remove the legacy iSeries ethernet driver Stephen Rothwell
@ 2012-03-08 4:35 ` Stephen Rothwell
2012-03-08 4:37 ` [PATCH 4/7] tty: powerpc: remove hvc_iseries Stephen Rothwell
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Brian King, ppc-dev, linux-scsi, James E.J. Bottomley, LKML
[-- Attachment #1: Type: text/plain, Size: 3584 bytes --]
The PowerPC legacy iSeries platform is being removed and this code is
no longer selectable. There is more clean up that can be done, but this
just gets the old code out of the way.
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Brian King <brking@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/scsi/Kconfig | 3 +-
drivers/scsi/ibmvscsi/Makefile | 1 -
drivers/scsi/ibmvscsi/ibmvscsi.c | 12 +--
drivers/scsi/ibmvscsi/ibmvscsi.h | 1 -
drivers/scsi/ibmvscsi/iseries_vscsi.c | 173 ---------------------------------
5 files changed, 3 insertions(+), 187 deletions(-)
delete mode 100644 drivers/scsi/ibmvscsi/iseries_vscsi.c
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 16570aa..e38d843 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -967,9 +967,8 @@ config SCSI_IPS
config SCSI_IBMVSCSI
tristate "IBM Virtual SCSI support"
- depends on PPC_PSERIES || PPC_ISERIES
+ depends on PPC_PSERIES
select SCSI_SRP_ATTRS
- select VIOPATH if PPC_ISERIES
help
This is the IBM POWER Virtual SCSI Client
diff --git a/drivers/scsi/ibmvscsi/Makefile b/drivers/scsi/ibmvscsi/Makefile
index a423d96..ff5b5c5 100644
--- a/drivers/scsi/ibmvscsi/Makefile
+++ b/drivers/scsi/ibmvscsi/Makefile
@@ -1,7 +1,6 @@
obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsic.o
ibmvscsic-y += ibmvscsi.o
-ibmvscsic-$(CONFIG_PPC_ISERIES) += iseries_vscsi.o
ibmvscsic-$(CONFIG_PPC_PSERIES) += rpa_vscsi.o
obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvstgt.o
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 3d391dc..e984951 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -55,13 +55,7 @@
* and sends a CRQ message back to inform the client that the request has
* completed.
*
- * Note that some of the underlying infrastructure is different between
- * machines conforming to the "RS/6000 Platform Architecture" (RPA) and
- * the older iSeries hypervisor models. To support both, some low level
- * routines have been broken out into rpa_vscsi.c and iseries_vscsi.c.
- * The Makefile should pick one, not two, not zero, of these.
- *
- * TODO: This is currently pretty tied to the IBM i/pSeries hypervisor
+ * TODO: This is currently pretty tied to the IBM pSeries hypervisor
* interfaces. It would be really nice to abstract this above an RDMA
* layer.
*/
@@ -2085,9 +2079,7 @@ int __init ibmvscsi_module_init(void)
driver_template.can_queue = max_requests;
max_events = max_requests + 2;
- if (firmware_has_feature(FW_FEATURE_ISERIES))
- ibmvscsi_ops = &iseriesvscsi_ops;
- else if (firmware_has_feature(FW_FEATURE_VIO))
+ if (firmware_has_feature(FW_FEATURE_VIO))
ibmvscsi_ops = &rpavscsi_ops;
else
return -ENODEV;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 02197a2..c503e17 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -127,7 +127,6 @@ struct ibmvscsi_ops {
int (*resume) (struct ibmvscsi_host_data *hostdata);
};
-extern struct ibmvscsi_ops iseriesvscsi_ops;
extern struct ibmvscsi_ops rpavscsi_ops;
#endif /* IBMVSCSI_H */
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
deleted file mode 100644
index f477645..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/7] tty: powerpc: remove hvc_iseries
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (2 preceding siblings ...)
2012-03-08 4:35 ` [PATCH 3/7] [SCSI] powerpc: remove the legacy iSeries part of ibmvscsi Stephen Rothwell
@ 2012-03-08 4:37 ` Stephen Rothwell
2012-03-08 4:39 ` [PATCH 5/7] tty: powerpc: remove SERIAL_ICOM dependency on PPC_ISERIES Stephen Rothwell
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:37 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Greg Kroah-Hartman, ppc-dev, LKML
[-- Attachment #1: Type: text/plain, Size: 1728 bytes --]
The PowerPC legacy iSeries platform is being removed, so this code is no
longer needed.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tty/hvc/Kconfig | 10 -
drivers/tty/hvc/Makefile | 1 -
drivers/tty/hvc/hvc_iseries.c | 599 -----------------------------------------
3 files changed, 0 insertions(+), 610 deletions(-)
delete mode 100644 drivers/tty/hvc/hvc_iseries.c
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 4222035..8ea7f07 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -24,16 +24,6 @@ config HVC_OLD_HVSI
depends on HVC_CONSOLE
default n
-config HVC_ISERIES
- bool "iSeries Hypervisor Virtual Console support"
- depends on PPC_ISERIES
- default y
- select HVC_DRIVER
- select HVC_IRQ
- select VIOPATH
- help
- iSeries machines support a hypervisor virtual console.
-
config HVC_OPAL
bool "OPAL Console support"
depends on PPC_POWERNV
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index 89abf40b..4ca3723 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -1,7 +1,6 @@
obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi_lib.o
obj-$(CONFIG_HVC_OPAL) += hvc_opal.o hvsi_lib.o
obj-$(CONFIG_HVC_OLD_HVSI) += hvsi.o
-obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
obj-$(CONFIG_HVC_TILE) += hvc_tile.o
obj-$(CONFIG_HVC_DCC) += hvc_dcc.o
diff --git a/drivers/tty/hvc/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
deleted file mode 100644
index 3f4a897..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/7] tty: powerpc: remove SERIAL_ICOM dependency on PPC_ISERIES
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (3 preceding siblings ...)
2012-03-08 4:37 ` [PATCH 4/7] tty: powerpc: remove hvc_iseries Stephen Rothwell
@ 2012-03-08 4:39 ` Stephen Rothwell
2012-03-08 11:18 ` Alan Cox
2012-03-08 4:41 ` [PATCH 6/7] driver-core: remove legacy iSeries hack Stephen Rothwell
` (4 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:39 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Greg Kroah-Hartman, ppc-dev, LKML, linux-serial, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
The PowerPC legacy iSeries platform is being removed so this is no
longer selectable.
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-serial@vger.kernel.org
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tty/serial/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2de9924..59e7983 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -853,7 +853,7 @@ config SERIAL_MPC52xx_CONSOLE_BAUD
config SERIAL_ICOM
tristate "IBM Multiport Serial Adapter"
- depends on PCI && (PPC_ISERIES || PPC_PSERIES)
+ depends on PCI && PPC_PSERIES
select SERIAL_CORE
select FW_LOADER
help
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/7] driver-core: remove legacy iSeries hack
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (4 preceding siblings ...)
2012-03-08 4:39 ` [PATCH 5/7] tty: powerpc: remove SERIAL_ICOM dependency on PPC_ISERIES Stephen Rothwell
@ 2012-03-08 4:41 ` Stephen Rothwell
2012-03-08 4:43 ` [PATCH 7/7] powerpc: clean up vio.c Stephen Rothwell
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:41 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Greg Kroah-Hartman, ppc-dev, LKML
[-- Attachment #1: Type: text/plain, Size: 2259 bytes --]
The PowerPC legacy iSeries plateform is being removed along with the
"one looney iseries driver", so this code can now be removed as well.
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/driver.c | 30 ------------------------------
include/linux/device.h | 4 ----
2 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index b631f7c..db4f54c 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -124,36 +124,6 @@ void driver_remove_file(struct device_driver *drv,
EXPORT_SYMBOL_GPL(driver_remove_file);
/**
- * driver_add_kobj - add a kobject below the specified driver
- * @drv: requesting device driver
- * @kobj: kobject to add below this driver
- * @fmt: format string that names the kobject
- *
- * You really don't want to do this, this is only here due to one looney
- * iseries driver, go poke those developers if you are annoyed about
- * this...
- */
-int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
- const char *fmt, ...)
-{
- va_list args;
- char *name;
- int ret;
-
- va_start(args, fmt);
- name = kvasprintf(GFP_KERNEL, fmt, args);
- va_end(args);
-
- if (!name)
- return -ENOMEM;
-
- ret = kobject_add(kobj, &drv->p->kobj, "%s", name);
- kfree(name);
- return ret;
-}
-EXPORT_SYMBOL_GPL(driver_add_kobj);
-
-/**
* get_driver - increment driver reference count.
* @drv: driver.
*/
diff --git a/include/linux/device.h b/include/linux/device.h
index b63fb39..46baa1f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -264,10 +264,6 @@ extern int __must_check driver_create_file(struct device_driver *driver,
extern void driver_remove_file(struct device_driver *driver,
const struct driver_attribute *attr);
-extern int __must_check driver_add_kobj(struct device_driver *drv,
- struct kobject *kobj,
- const char *fmt, ...);
-
extern int __must_check driver_for_each_device(struct device_driver *drv,
struct device *start,
void *data,
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/7] powerpc: clean up vio.c
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (5 preceding siblings ...)
2012-03-08 4:41 ` [PATCH 6/7] driver-core: remove legacy iSeries hack Stephen Rothwell
@ 2012-03-08 4:43 ` Stephen Rothwell
2012-03-08 6:53 ` [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers David Miller
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-03-08 4:43 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: ppc-dev, LKML
[-- Attachment #1: Type: text/plain, Size: 3704 bytes --]
This cleans up vio.c after the removal of the legacy iSeries platform.
It also removes some no longer referenced include files.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/iseries/hv_call_event.h | 201 ----------------
arch/powerpc/include/asm/iseries/hv_lp_event.h | 162 -------------
arch/powerpc/include/asm/iseries/iommu.h | 37 ---
arch/powerpc/include/asm/iseries/vio.h | 265 ----------------------
arch/powerpc/kernel/vio.c | 18 +--
5 files changed, 1 insertions(+), 682 deletions(-)
delete mode 100644 arch/powerpc/include/asm/iseries/hv_call_event.h
delete mode 100644 arch/powerpc/include/asm/iseries/hv_lp_event.h
delete mode 100644 arch/powerpc/include/asm/iseries/iommu.h
delete mode 100644 arch/powerpc/include/asm/iseries/vio.h
diff --git a/arch/powerpc/include/asm/iseries/hv_call_event.h b/arch/powerpc/include/asm/iseries/hv_call_event.h
deleted file mode 100644
index cc029d3..0000000
diff --git a/arch/powerpc/include/asm/iseries/hv_lp_event.h b/arch/powerpc/include/asm/iseries/hv_lp_event.h
deleted file mode 100644
index 8f5da7d..0000000
diff --git a/arch/powerpc/include/asm/iseries/iommu.h b/arch/powerpc/include/asm/iseries/iommu.h
deleted file mode 100644
index 1b9692c..0000000
diff --git a/arch/powerpc/include/asm/iseries/vio.h b/arch/powerpc/include/asm/iseries/vio.h
deleted file mode 100644
index f9ac0d0..0000000
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 8b08629..bca3fc4 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -34,11 +34,6 @@
#include <asm/abs_addr.h>
#include <asm/page.h>
#include <asm/hvcall.h>
-#include <asm/iseries/vio.h>
-#include <asm/iseries/hv_types.h>
-#include <asm/iseries/hv_lp_config.h>
-#include <asm/iseries/hv_call_xm.h>
-#include <asm/iseries/iommu.h>
static struct bus_type vio_bus_type;
@@ -1042,7 +1037,6 @@ static void vio_cmo_sysfs_init(void)
vio_bus_type.bus_attrs = vio_cmo_bus_attrs;
}
#else /* CONFIG_PPC_SMLPAR */
-/* Dummy functions for iSeries platform */
int vio_cmo_entitlement_update(size_t new_entitlement) { return 0; }
void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired) {}
static int vio_cmo_bus_probe(struct vio_dev *viodev) { return 0; }
@@ -1060,9 +1054,6 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
struct iommu_table *tbl;
unsigned long offset, size;
- if (firmware_has_feature(FW_FEATURE_ISERIES))
- return vio_build_iommu_table_iseries(dev);
-
dma_window = of_get_property(dev->dev.of_node,
"ibm,my-dma-window", NULL);
if (!dma_window)
@@ -1195,8 +1186,7 @@ static void __devinit vio_dev_release(struct device *dev)
{
struct iommu_table *tbl = get_iommu_table_base(dev);
- /* iSeries uses a common table for all vio devices */
- if (!firmware_has_feature(FW_FEATURE_ISERIES) && tbl)
+ if (tbl)
iommu_free_table(tbl, dev->of_node ?
dev->of_node->full_name : dev_name(dev));
of_node_put(dev->of_node);
@@ -1244,12 +1234,6 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
viodev->name = of_node->name;
viodev->type = of_node->type;
viodev->unit_address = *unit_address;
- if (firmware_has_feature(FW_FEATURE_ISERIES)) {
- unit_address = of_get_property(of_node,
- "linux,unit_address", NULL);
- if (unit_address != NULL)
- viodev->unit_address = *unit_address;
- }
viodev->dev.of_node = of_node_get(of_node);
if (firmware_has_feature(FW_FEATURE_CMO))
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (6 preceding siblings ...)
2012-03-08 4:43 ` [PATCH 7/7] powerpc: clean up vio.c Stephen Rothwell
@ 2012-03-08 6:53 ` David Miller
2012-03-08 10:37 ` Jens Axboe
2012-03-08 17:59 ` Greg Kroah-Hartman
9 siblings, 0 replies; 13+ messages in thread
From: David Miller @ 2012-03-08 6:53 UTC (permalink / raw)
To: sfr
Cc: axboe, linux-scsi, gregkh, linux-kernel, JBottomley, linux-serial,
netdev, brking, linuxppc-dev, alan
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Mar 2012 15:28:53 +1100
> It would probably be easiest if all these patches were merged via the
> powerpc tree to eliminate any dependencies between them. Their impact on
> generic code is very small.
No objections.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (7 preceding siblings ...)
2012-03-08 6:53 ` [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers David Miller
@ 2012-03-08 10:37 ` Jens Axboe
2012-03-08 17:59 ` Greg Kroah-Hartman
9 siblings, 0 replies; 13+ messages in thread
From: Jens Axboe @ 2012-03-08 10:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-scsi, Greg Kroah-Hartman, LKML, James E.J. Bottomley,
linux-serial, netdev, Brian King, ppc-dev, David Miller, Alan Cox
On 03/08/2012 05:28 AM, Stephen Rothwell wrote:
> It would probably be easiest if all these patches were merged via the
> powerpc tree to eliminate any dependencies between them. Their impact on
> generic code is very small.
Go ahead, no point in doing otherwise.
--
Jens Axboe
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
2012-03-08 4:28 [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers Stephen Rothwell
` (8 preceding siblings ...)
2012-03-08 10:37 ` Jens Axboe
@ 2012-03-08 17:59 ` Greg Kroah-Hartman
9 siblings, 0 replies; 13+ messages in thread
From: Greg Kroah-Hartman @ 2012-03-08 17:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, linux-scsi, LKML, James E.J. Bottomley, linux-serial,
netdev, Brian King, ppc-dev, David Miller, Alan Cox
On Thu, Mar 08, 2012 at 03:28:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> This series of patches removes all the legacy iSeries platform specific
> drivers (and the iSeries specific part of one). The legacy iSeries
> platform main code has already bee removed along with CONFIG_PPC_ISERIES,
> so none of this code is selectable or needed any more.
>
> It would probably be easiest if all these patches were merged via the
> powerpc tree to eliminate any dependencies between them. Their impact on
> generic code is very small.
No objection from me at all.
greg k-h
^ permalink raw reply [flat|nested] 13+ messages in thread