Skip to content

Commit

Permalink
[POWERPC] scsi: Constify & voidify get_property()
Browse files Browse the repository at this point in the history
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: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Jeremy Kerr authored and Paul Mackerras committed Jul 31, 2006
1 parent b04e3dd commit 294ef16
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
11 changes: 4 additions & 7 deletions drivers/scsi/ibmvscsi/rpa_vscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,23 +156,20 @@ 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("/");
if (!rootdn) {
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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/mac53c94.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions drivers/scsi/mesh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 294ef16

Please sign in to comment.