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

Commit 294ef16a authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[POWERPC] scsi: Constify & voidify get_property() 



Now that get_property() returns a void *, there's no need to cast its
return value. Also, treat the return value as const, so we can
constify get_property later.

powerpc-specific scsi driver changes.

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b04e3dd4

drivers/scsi/ibmvscsi/rpa_vscsi.c

+4 −7
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ static void gather_partition_info(void) 
{

	struct device_node *rootdn;



	char *ppartition_name;

	unsigned int *p_number_ptr;

	const char *ppartition_name;

	const unsigned int *p_number_ptr;



	/* Retrieve information about this partition */

	rootdn = find_path_device("/");
@@ -165,14 +165,11 @@ static void gather_partition_info(void) 
		return;

	}



	ppartition_name =

		get_property(rootdn, "ibm,partition-name", NULL);

	ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);

	if (ppartition_name)

		strncpy(partition_name, ppartition_name,

				sizeof(partition_name));

	p_number_ptr =

		(unsigned int *)get_property(rootdn, "ibm,partition-no",

					     NULL);

	p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);

	if (p_number_ptr)

		partition_number = *p_number_ptr;

}

drivers/scsi/mac53c94.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat 
	struct fsc_state *state;

	struct Scsi_Host *host;

	void *dma_cmd_space;

	unsigned char *clkprop;

	const unsigned char *clkprop;

	int proplen, rc = -ENODEV;



	if (macio_resource_count(mdev) != 2 || macio_irq_count(mdev) != 2) {

drivers/scsi/mesh.c

+3 −2
Original line number Diff line number Diff line
@@ -1850,7 +1850,8 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) 
{

	struct device_node *mesh = macio_get_of_node(mdev);

	struct pci_dev* pdev = macio_get_pci_dev(mdev);

	int tgt, *cfp, minper;

	int tgt, minper;

	const int *cfp;

	struct mesh_state *ms;

	struct Scsi_Host *mesh_host;

	void *dma_cmd_space;
@@ -1939,7 +1940,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	       	ms->tgts[tgt].current_req = NULL;

       	}



	if ((cfp = (int *) get_property(mesh, "clock-frequency", NULL)))

	if ((cfp = get_property(mesh, "clock-frequency", NULL)))

       		ms->clk_freq = *cfp;

	else {

       		printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");