Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7edd0e6 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] get_property returns const 



This just tidies up some of the remains.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6c2d0469

drivers/hwmon/ams/ams-core.c

+2 −2
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ static void ams_worker(struct work_struct *work) 
int ams_sensor_attach(void)

{

	int result;

	u32 *prop;

	const u32 *prop;



	/* Get orientation */

	prop = (u32*)get_property(ams_info.of_node, "orientation", NULL);

	prop = get_property(ams_info.of_node, "orientation", NULL);

	if (!prop)

		return -ENODEV;

	ams_info.orient1 = *prop;

drivers/hwmon/ams/ams-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ int __init ams_i2c_init(struct device_node *np) 
{

	char *tmp_bus;

	int result;

	u32 *prop;

	const u32 *prop;



	mutex_lock(&ams_info.lock);
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np) 
	ams_info.bustype = BUS_I2C;



	/* look for bus either using "reg" or by path */

	prop = (u32*)get_property(ams_info.of_node, "reg", NULL);

	prop = get_property(ams_info.of_node, "reg", NULL);

	if (!prop) {

		result = -ENODEV;

drivers/hwmon/ams/ams-pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void ams_pmu_exit(void) 


int __init ams_pmu_init(struct device_node *np)

{

	u32 *prop;

	const u32 *prop;

	int result;



	mutex_lock(&ams_info.lock);
@@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np) 
	ams_info.bustype = BUS_HOST;



	/* Get PMU command, should be 0x4e, but we can never know */

	prop = (u32*)get_property(ams_info.of_node, "reg", NULL);

	prop = get_property(ams_info.of_node, "reg", NULL);

	if (!prop) {

		result = -ENODEV;

		goto exit;

drivers/infiniband/hw/ehca/ehca_main.c

+2 −2
Original line number Diff line number Diff line
@@ -565,11 +565,11 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev, 
				const struct of_device_id *id)

{

	struct ehca_shca *shca;

	u64 *handle;

	const u64 *handle;

	struct ib_pd *ibpd;

	int ret;



	handle = (u64 *)get_property(dev->ofdev.node, "ibm,hca-handle", NULL);

	handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);

	if (!handle) {

		ehca_gen_err("Cannot get eHCA handle for adapter: %s.",

			     dev->ofdev.node->full_name);

drivers/net/ehea/ehea_main.c

+4 −4
Original line number Diff line number Diff line
@@ -2320,7 +2320,7 @@ static int ehea_setup_single_port(struct ehea_port *port, 
	struct net_device *dev = port->netdev;

	struct ehea_adapter *adapter = port->adapter;

	struct hcp_ehea_port_cb4 *cb4;

	u32 *dn_log_port_id;

	const u32 *dn_log_port_id;

	int jumbo = 0;



	sema_init(&port->port_lock, 1);
@@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port, 
	port->of_dev_node = dn;



	/* Determine logical port id */

	dn_log_port_id = (u32*)get_property(dn, "ibm,hea-port-no", NULL);

	dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL);



	if (!dn_log_port_id) {

		ehea_error("bad device node: dn_log_port_id=%p",
@@ -2492,7 +2492,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev, 
				const struct of_device_id *id)

{

	struct ehea_adapter *adapter;

	u64 *adapter_handle;

	const u64 *adapter_handle;

	int ret;



	adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
@@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev, 
		goto out;

	}



	adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",

	adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",

					    NULL);

	if (adapter_handle)

		adapter->handle = *adapter_handle;