redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[POWERPC] ibmebus: whitespace fixes 

This fixes a lot of whitespace in ibmebus.[ch]

Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
hifive-unleashed-5.1
Joachim Fenkes 2007-03-09 18:56:46 +01:00 committed by Paul Mackerras
parent 556b09c818
commit a83088003c
2 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
arch/powerpc/kernel/ibmebus.c
View File

@ -3,35 +3,35 @@
* *
* Copyright (c) 2005 IBM Corporation * Copyright (c) 2005 IBM Corporation
* Heiko J Schick <schickhj@de.ibm.com> * Heiko J Schick <schickhj@de.ibm.com>
* *
* All rights reserved. * All rights reserved.
* *
* This source code is distributed under a dual license of GPL v2.0 and OpenIB * This source code is distributed under a dual license of GPL v2.0 and OpenIB
* BSD. * BSD.
* *
* OpenIB BSD License * OpenIB BSD License
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* *
* Redistributions of source code must retain the above copyright notice, this * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer. * list of conditions and the following disclaimer.
* *
* Redistributions in binary form must reproduce the above copyright notice, * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials * and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@ -55,7 +55,7 @@ static void *ibmebus_alloc_coherent(struct device *dev,
gfp_t flag) gfp_t flag)
{ {
void *mem; void *mem;
mem = kmalloc(size, flag); mem = kmalloc(size, flag);
*dma_handle = (dma_addr_t)mem; *dma_handle = (dma_addr_t)mem;
@ -63,7 +63,7 @@ static void *ibmebus_alloc_coherent(struct device *dev,
} }
static void ibmebus_free_coherent(struct device *dev, static void ibmebus_free_coherent(struct device *dev,
size_t size, void *vaddr, size_t size, void *vaddr,
dma_addr_t dma_handle) dma_addr_t dma_handle)
{ {
kfree(vaddr); kfree(vaddr);
@ -79,7 +79,7 @@ static dma_addr_t ibmebus_map_single(struct device *dev,
static void ibmebus_unmap_single(struct device *dev, static void ibmebus_unmap_single(struct device *dev,
dma_addr_t dma_addr, dma_addr_t dma_addr,
size_t size, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
return; return;
@ -90,13 +90,13 @@ static int ibmebus_map_sg(struct device *dev,
int nents, enum dma_data_direction direction) int nents, enum dma_data_direction direction)
{ {
int i; int i;
for (i = 0; i < nents; i++) { for (i = 0; i < nents; i++) {
sg[i].dma_address = (dma_addr_t)page_address(sg[i].page) sg[i].dma_address = (dma_addr_t)page_address(sg[i].page)
+ sg[i].offset; + sg[i].offset;
sg[i].dma_length = sg[i].length; sg[i].dma_length = sg[i].length;
} }
return nents; return nents;
} }
@ -128,15 +128,15 @@ static int ibmebus_bus_probe(struct device *dev)
struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver); struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver);
const struct of_device_id *id; const struct of_device_id *id;
int error = -ENODEV; int error = -ENODEV;
if (!ibmebusdrv->probe) if (!ibmebusdrv->probe)
return error; return error;
id = of_match_device(ibmebusdrv->id_table, &ibmebusdev->ofdev); id = of_match_device(ibmebusdrv->id_table, &ibmebusdev->ofdev);
if (id) { if (id) {
error = ibmebusdrv->probe(ibmebusdev, id); error = ibmebusdrv->probe(ibmebusdev, id);
} }
return error; return error;
} }
@ -144,11 +144,11 @@ static int ibmebus_bus_remove(struct device *dev)
{ {
struct ibmebus_dev *ibmebusdev = to_ibmebus_dev(dev); struct ibmebus_dev *ibmebusdev = to_ibmebus_dev(dev);
struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver); struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver);
if (ibmebusdrv->remove) { if (ibmebusdrv->remove) {
return ibmebusdrv->remove(ibmebusdev); return ibmebusdrv->remove(ibmebusdev);
} }
return 0; return 0;
} }
@ -158,12 +158,12 @@ static void __devinit ibmebus_dev_release(struct device *dev)
kfree(to_ibmebus_dev(dev)); kfree(to_ibmebus_dev(dev));
} }
static ssize_t ibmebusdev_show_name(struct device *dev, static ssize_t ibmebusdev_show_name(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%s\n", to_ibmebus_dev(dev)->name); return sprintf(buf, "%s\n", to_ibmebus_dev(dev)->name);
} }
static DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, ibmebusdev_show_name, static DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, ibmebusdev_show_name,
NULL); NULL);
static struct ibmebus_dev* __devinit ibmebus_register_device_common( static struct ibmebus_dev* __devinit ibmebus_register_device_common(
@ -181,16 +181,16 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_common(
dev->ofdev.dev.archdata.numa_node = of_node_to_nid(dev->ofdev.node); dev->ofdev.dev.archdata.numa_node = of_node_to_nid(dev->ofdev.node);
/* An ibmebusdev is based on a of_device. We have to change the /* An ibmebusdev is based on a of_device. We have to change the
* bus type to use our own DMA mapping operations. * bus type to use our own DMA mapping operations.
*/ */
if ((err = of_device_register(&dev->ofdev)) != 0) { if ((err = of_device_register(&dev->ofdev)) != 0) {
printk(KERN_ERR "%s: failed to register device (%d).\n", printk(KERN_ERR "%s: failed to register device (%d).\n",
__FUNCTION__, err); __FUNCTION__, err);
return NULL; return NULL;
} }
device_create_file(&dev->ofdev.dev, &dev_attr_name); device_create_file(&dev->ofdev.dev, &dev_attr_name);
return dev; return dev;
} }
@ -207,7 +207,7 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
__FUNCTION__, dn->name ? dn->name : "<unknown>"); __FUNCTION__, dn->name ? dn->name : "<unknown>");
return NULL; return NULL;
} }
if (strlen(loc_code) == 0) { if (strlen(loc_code) == 0) {
printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n", printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n",
__FUNCTION__); __FUNCTION__);
@ -220,10 +220,10 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
} }
dev->ofdev.node = of_node_get(dn); dev->ofdev.node = of_node_get(dn);
length = strlen(loc_code); length = strlen(loc_code);
memcpy(dev->ofdev.dev.bus_id, loc_code memcpy(dev->ofdev.dev.bus_id, loc_code
+ (length - min(length, BUS_ID_SIZE - 1)), + (length - min(length, BUS_ID_SIZE - 1)),
min(length, BUS_ID_SIZE - 1)); min(length, BUS_ID_SIZE - 1));
/* Register with generic device framework. */ /* Register with generic device framework. */
@ -238,17 +238,17 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
static void ibmebus_probe_of_nodes(char* name) static void ibmebus_probe_of_nodes(char* name)
{ {
struct device_node *dn = NULL; struct device_node *dn = NULL;
while ((dn = of_find_node_by_name(dn, name))) { while ((dn = of_find_node_by_name(dn, name))) {
if (ibmebus_register_device_node(dn) == NULL) { if (ibmebus_register_device_node(dn) == NULL) {
of_node_put(dn); of_node_put(dn);
return; return;
} }
} }
of_node_put(dn); of_node_put(dn);
return; return;
} }
@ -266,7 +266,7 @@ static int ibmebus_match_helper(struct device *dev, void *data)
{ {
if (strcmp((char*)data, to_ibmebus_dev(dev)->name) == 0) if (strcmp((char*)data, to_ibmebus_dev(dev)->name) == 0)
return 1; return 1;
return 0; return 0;
} }
@ -281,17 +281,17 @@ static int ibmebus_unregister_device(struct device *dev)
static void ibmebus_remove_devices_by_id(struct of_device_id *idt) static void ibmebus_remove_devices_by_id(struct of_device_id *idt)
{ {
struct device *dev; struct device *dev;
while (strlen(idt->name) > 0) { while (strlen(idt->name) > 0) {
while ((dev = bus_find_device(&ibmebus_bus_type, NULL, while ((dev = bus_find_device(&ibmebus_bus_type, NULL,
(void*)idt->name, (void*)idt->name,
ibmebus_match_helper))) { ibmebus_match_helper))) {
ibmebus_unregister_device(dev); ibmebus_unregister_device(dev);
} }
idt++; idt++;
} }
return; return;
} }
@ -308,29 +308,29 @@ int ibmebus_register_driver(struct ibmebus_driver *drv)
return err; return err;
ibmebus_add_devices_by_id(drv->id_table); ibmebus_add_devices_by_id(drv->id_table);
return 0; return 0;
} }
EXPORT_SYMBOL(ibmebus_register_driver); EXPORT_SYMBOL(ibmebus_register_driver);
void ibmebus_unregister_driver(struct ibmebus_driver *drv) void ibmebus_unregister_driver(struct ibmebus_driver *drv)
{ {
driver_unregister(&drv->driver); driver_unregister(&drv->driver);
ibmebus_remove_devices_by_id(drv->id_table); ibmebus_remove_devices_by_id(drv->id_table);
} }
EXPORT_SYMBOL(ibmebus_unregister_driver); EXPORT_SYMBOL(ibmebus_unregister_driver);
int ibmebus_request_irq(struct ibmebus_dev *dev, int ibmebus_request_irq(struct ibmebus_dev *dev,
u32 ist, u32 ist,
irq_handler_t handler, irq_handler_t handler,
unsigned long irq_flags, const char * devname, unsigned long irq_flags, const char * devname,
void *dev_id) void *dev_id)
{ {
unsigned int irq = irq_create_mapping(NULL, ist); unsigned int irq = irq_create_mapping(NULL, ist);
if (irq == NO_IRQ) if (irq == NO_IRQ)
return -EINVAL; return -EINVAL;
return request_irq(irq, handler, return request_irq(irq, handler,
irq_flags, devname, dev_id); irq_flags, devname, dev_id);
} }
@ -339,25 +339,25 @@ EXPORT_SYMBOL(ibmebus_request_irq);
void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id) void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)
{ {
unsigned int irq = irq_find_mapping(NULL, ist); unsigned int irq = irq_find_mapping(NULL, ist);
free_irq(irq, dev_id); free_irq(irq, dev_id);
} }
EXPORT_SYMBOL(ibmebus_free_irq); EXPORT_SYMBOL(ibmebus_free_irq);
static int ibmebus_bus_match(struct device *dev, struct device_driver *drv) static int ibmebus_bus_match(struct device *dev, struct device_driver *drv)
{ {
const struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev); const struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev);
struct ibmebus_driver *ebus_drv = to_ibmebus_driver(drv); struct ibmebus_driver *ebus_drv = to_ibmebus_driver(drv);
const struct of_device_id *ids = ebus_drv->id_table; const struct of_device_id *ids = ebus_drv->id_table;
const struct of_device_id *found_id; const struct of_device_id *found_id;
if (!ids) if (!ids)
return 0; return 0;
found_id = of_match_device(ids, &ebus_dev->ofdev); found_id = of_match_device(ids, &ebus_dev->ofdev);
if (found_id) if (found_id)
return 1; return 1;
return 0; return 0;
} }
@ -370,25 +370,25 @@ EXPORT_SYMBOL(ibmebus_bus_type);
static int __init ibmebus_bus_init(void) static int __init ibmebus_bus_init(void)
{ {
int err; int err;
printk(KERN_INFO "IBM eBus Device Driver\n"); printk(KERN_INFO "IBM eBus Device Driver\n");
err = bus_register(&ibmebus_bus_type); err = bus_register(&ibmebus_bus_type);
if (err) { if (err) {
printk(KERN_ERR ":%s: failed to register IBM eBus.\n", printk(KERN_ERR ":%s: failed to register IBM eBus.\n",
__FUNCTION__); __FUNCTION__);
return err; return err;
} }
err = device_register(&ibmebus_bus_device.ofdev.dev); err = device_register(&ibmebus_bus_device.ofdev.dev);
if (err) { if (err) {
printk(KERN_WARNING "%s: device_register returned %i\n", printk(KERN_WARNING "%s: device_register returned %i\n",
__FUNCTION__, err); __FUNCTION__, err);
bus_unregister(&ibmebus_bus_type); bus_unregister(&ibmebus_bus_type);
return err; return err;
} }
return 0; return 0;
} }
__initcall(ibmebus_bus_init); __initcall(ibmebus_bus_init);

42
include/asm-powerpc/ibmebus.h
View File

@ -3,35 +3,35 @@
* *
* Copyright (c) 2005 IBM Corporation * Copyright (c) 2005 IBM Corporation
* Heiko J Schick <schickhj@de.ibm.com> * Heiko J Schick <schickhj@de.ibm.com>
* *
* All rights reserved. * All rights reserved.
* *
* This source code is distributed under a dual license of GPL v2.0 and OpenIB * This source code is distributed under a dual license of GPL v2.0 and OpenIB
* BSD. * BSD.
* *
* OpenIB BSD License * OpenIB BSD License
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* *
* Redistributions of source code must retain the above copyright notice, this * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer. * list of conditions and the following disclaimer.
* *
* Redistributions in binary form must reproduce the above copyright notice, * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials * and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
@ -46,12 +46,12 @@
extern struct bus_type ibmebus_bus_type; extern struct bus_type ibmebus_bus_type;
struct ibmebus_dev { struct ibmebus_dev {
const char *name; const char *name;
struct of_device ofdev; struct of_device ofdev;
}; };
struct ibmebus_driver { struct ibmebus_driver {
char *name; char *name;
struct of_device_id *id_table; struct of_device_id *id_table;
int (*probe) (struct ibmebus_dev *dev, const struct of_device_id *id); int (*probe) (struct ibmebus_dev *dev, const struct of_device_id *id);
@ -63,7 +63,7 @@ int ibmebus_register_driver(struct ibmebus_driver *drv);
void ibmebus_unregister_driver(struct ibmebus_driver *drv); void ibmebus_unregister_driver(struct ibmebus_driver *drv);
int ibmebus_request_irq(struct ibmebus_dev *dev, int ibmebus_request_irq(struct ibmebus_dev *dev,
u32 ist, u32 ist,
irq_handler_t handler, irq_handler_t handler,
unsigned long irq_flags, const char * devname, unsigned long irq_flags, const char * devname,
void *dev_id); void *dev_id);