The patch number 8275 was added via Michael Krufky <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Michael Krufky <[EMAIL PROTECTED]>
sms1xxx: codingstyle cleanup: "foo* bar"/"foo * bar" should be "foo *bar"
ERROR: "foo* bar" should be "foo *bar"
ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/siano/smscoreapi.c | 39 ++++++++++++---------
linux/drivers/media/dvb/siano/smscoreapi.h | 10 +++--
linux/drivers/media/dvb/siano/smsdvb.c | 11 +++--
linux/drivers/media/dvb/siano/smsusb.c | 18 ++++-----
4 files changed, 46 insertions(+), 32 deletions(-)
diff -r 6949d67b8fbb -r 2637bbb78aba linux/drivers/media/dvb/siano/smscoreapi.c
--- a/linux/drivers/media/dvb/siano/smscoreapi.c Thu May 22 14:32:40
2008 -0400
+++ b/linux/drivers/media/dvb/siano/smscoreapi.c Mon May 05 23:11:51
2008 -0400
@@ -112,7 +112,7 @@ module_param(default_mode, int, 0644);
module_param(default_mode, int, 0644);
MODULE_PARM_DESC(default_mode, "default firmware id (device mode)");
-int smscore_registry_getmode(char* devpath)
+int smscore_registry_getmode(char *devpath)
{
smscore_registry_entry_t *entry;
struct list_head *next;
@@ -144,7 +144,7 @@ int smscore_registry_getmode(char* devpa
return default_mode;
}
-void smscore_registry_setmode(char* devpath, int mode)
+void smscore_registry_setmode(char *devpath, int mode)
{
smscore_registry_entry_t *entry;
struct list_head *next;
@@ -213,7 +213,8 @@ out:
}
#endif
-void list_add_locked(struct list_head *new, struct list_head *head,
spinlock_t* lock)
+void list_add_locked(struct list_head *new, struct list_head *head,
+ spinlock_t *lock)
{
unsigned long flags;
@@ -298,7 +299,7 @@ void smscore_unregister_hotplug(hotplug_
void smscore_notify_clients(smscore_device_t *coredev)
{
- smscore_client_t* client;
+ smscore_client_t *client;
// the client must call smscore_unregister_client from remove handler
while (!list_empty(&coredev->clients))
@@ -327,7 +328,8 @@ int smscore_notify_callbacks(smscore_dev
return rc;
}
-smscore_buffer_t *smscore_createbuffer(u8* buffer, void* common_buffer,
dma_addr_t common_buffer_phys)
+smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer,
+ dma_addr_t common_buffer_phys)
{
smscore_buffer_t *cb = kmalloc(sizeof(smscore_buffer_t), GFP_KERNEL);
if (!cb)
@@ -354,7 +356,7 @@ smscore_buffer_t *smscore_createbuffer(u
*/
int smscore_register_device(smsdevice_params_t *params, smscore_device_t
**coredev)
{
- smscore_device_t* dev;
+ smscore_device_t *dev;
u8 *buffer;
dev = kzalloc(sizeof(smscore_device_t), GFP_KERNEL);
@@ -456,7 +458,8 @@ int smscore_start_device(smscore_device_
return rc;
}
-int smscore_sendrequest_and_wait(smscore_device_t *coredev, void* buffer,
size_t size, struct completion *completion)
+int smscore_sendrequest_and_wait(smscore_device_t *coredev, void *buffer,
+ size_t size, struct completion *completion)
{
int rc = coredev->sendrequest_handler(coredev->context, buffer, size);
if (rc < 0)
@@ -470,7 +473,7 @@ int smscore_load_firmware_family2(smscor
SmsFirmware_ST* firmware = (SmsFirmware_ST*) buffer;
SmsMsgHdr_ST *msg;
UINT32 mem_address = firmware->StartAddress;
- u8* payload = firmware->Payload;
+ u8 *payload = firmware->Payload;
int rc = 0;
if (coredev->preload_handler)
@@ -560,13 +563,14 @@ int smscore_load_firmware_family2(smscor
*
* @return 0 on success, <0 on error.
*/
-int smscore_load_firmware(smscore_device_t *coredev, char* filename,
loadfirmware_t loadfirmware_handler)
+int smscore_load_firmware(smscore_device_t *coredev, char *filename,
+ loadfirmware_t loadfirmware_handler)
{
int rc = -ENOENT;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
const struct firmware *fw;
- u8* fw_buffer;
+ u8 *fw_buffer;
if (loadfirmware_handler == NULL && !(coredev->device_flags &
SMS_DEVICE_FAMILY2))
return -EINVAL;
@@ -788,7 +792,8 @@ int smscore_get_device_mode(smscore_devi
return coredev->mode;
}
-smscore_client_t* smscore_getclient_by_type(smscore_device_t *coredev, int
data_type)
+smscore_client_t *smscore_getclient_by_type(smscore_device_t *coredev,
+ int data_type)
{
smscore_client_t *client = NULL;
struct list_head *next, *first;
@@ -815,7 +820,7 @@ smscore_client_t* smscore_getclient_by_t
return client;
}
-smscore_client_t* smscore_getclient_by_id(smscore_device_t *coredev, int id)
+smscore_client_t *smscore_getclient_by_id(smscore_device_t *coredev, int id)
{
smscore_client_t *client = NULL;
struct list_head *next, *first;
@@ -850,7 +855,8 @@ void smscore_onresponse(smscore_device_t
void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb)
{
SmsMsgHdr_ST *phdr = (SmsMsgHdr_ST *)((u8*) cb->p + cb->offset);
- smscore_client_t * client = smscore_getclient_by_type(coredev,
phdr->msgType);
+ smscore_client_t *client = smscore_getclient_by_type(coredev,
+ phdr->msgType);
int rc = -EBUSY;
#if 1
@@ -1008,7 +1014,7 @@ int smscore_validate_client(smscore_devi
*/
int smscore_register_client(smscore_device_t *coredev, smsclient_params_t
*params, smscore_client_t **client)
{
- smscore_client_t* newclient;
+ smscore_client_t *newclient;
int rc;
// check that no other channel with same data type exists
@@ -1090,7 +1096,7 @@ void smscore_unregister_client(smscore_c
*/
int smsclient_sendrequest(smscore_client_t *client, void *buffer, size_t size)
{
- smscore_device_t* coredev = client->coredev;
+ smscore_device_t *coredev = client->coredev;
SmsMsgHdr_ST* phdr = (SmsMsgHdr_ST*) buffer;
// check that no other channel with same id exists
@@ -1121,7 +1127,8 @@ int smscore_get_common_buffer_size(smsco
*
* @return 0 on success, <0 on error.
*/
-int smscore_map_common_buffer(smscore_device_t *coredev, struct vm_area_struct
* vma)
+int smscore_map_common_buffer(smscore_device_t *coredev,
+ struct vm_area_struct *vma)
{
unsigned long end = vma->vm_end, start = vma->vm_start, size =
PAGE_ALIGN(coredev->common_buffer_size);
diff -r 6949d67b8fbb -r 2637bbb78aba linux/drivers/media/dvb/siano/smscoreapi.h
--- a/linux/drivers/media/dvb/siano/smscoreapi.h Thu May 22 14:32:40
2008 -0400
+++ b/linux/drivers/media/dvb/siano/smscoreapi.h Mon May 05 23:11:51
2008 -0400
@@ -518,19 +518,23 @@ extern void smscore_unregister_device(sm
extern void smscore_unregister_device(smscore_device_t *coredev);
extern int smscore_start_device(smscore_device_t *coredev);
-extern int smscore_load_firmware(smscore_device_t *coredev, char* filename,
loadfirmware_t loadfirmware_handler);
+extern int smscore_load_firmware(smscore_device_t *coredev, char *filename,
+ loadfirmware_t loadfirmware_handler);
extern int smscore_set_device_mode(smscore_device_t *coredev, int mode);
extern int smscore_get_device_mode(smscore_device_t *coredev);
-extern int smscore_register_client(smscore_device_t *coredev,
smsclient_params_t* params, smscore_client_t **client);
+extern int smscore_register_client(smscore_device_t *coredev,
+ smsclient_params_t *params,
+ smscore_client_t **client);
extern void smscore_unregister_client(smscore_client_t *client);
extern int smsclient_sendrequest(smscore_client_t *client, void *buffer,
size_t size);
extern void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t
*cb);
extern int smscore_get_common_buffer_size(smscore_device_t *coredev);
-extern int smscore_map_common_buffer(smscore_device_t *coredev, struct
vm_area_struct * vma);
+extern int smscore_map_common_buffer(smscore_device_t *coredev,
+ struct vm_area_struct *vma);
extern smscore_buffer_t *smscore_getbuffer(smscore_device_t *coredev);
extern void smscore_putbuffer(smscore_device_t *coredev, smscore_buffer_t *cb);
diff -r 6949d67b8fbb -r 2637bbb78aba linux/drivers/media/dvb/siano/smsdvb.c
--- a/linux/drivers/media/dvb/siano/smsdvb.c Thu May 22 14:32:40 2008 -0400
+++ b/linux/drivers/media/dvb/siano/smsdvb.c Mon May 05 23:11:51 2008 -0400
@@ -79,7 +79,7 @@ int smsdvb_onresponse(void *context, sms
return 0;
}
-void smsdvb_unregister_client(smsdvb_client_t* client)
+void smsdvb_unregister_client(smsdvb_client_t *client)
{
// must be called under clientslock
@@ -136,7 +136,9 @@ static int smsdvb_stop_feed(struct dvb_d
return smsclient_sendrequest(client->smsclient, &PidMsg,
sizeof(PidMsg));
}
-static int smsdvb_sendrequest_and_wait(smsdvb_client_t *client, void* buffer,
size_t size, struct completion *completion)
+static int smsdvb_sendrequest_and_wait(smsdvb_client_t *client,
+ void *buffer, size_t size,
+ struct completion *completion)
{
int rc = smsclient_sendrequest(client->smsclient, buffer, size);
if (rc < 0)
@@ -283,10 +285,11 @@ static struct dvb_frontend_ops smsdvb_fe
.read_snr = smsdvb_read_snr,
};
-int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int
arrival)
+int smsdvb_hotplug(smscore_device_t *coredev, struct device *device,
+ int arrival)
{
smsclient_params_t params;
- smsdvb_client_t* client;
+ smsdvb_client_t *client;
int rc;
// device removal handled by onremove callback
diff -r 6949d67b8fbb -r 2637bbb78aba linux/drivers/media/dvb/siano/smsusb.c
--- a/linux/drivers/media/dvb/siano/smsusb.c Thu May 22 14:32:40 2008 -0400
+++ b/linux/drivers/media/dvb/siano/smsusb.c Mon May 05 23:11:51 2008 -0400
@@ -44,7 +44,7 @@ typedef struct _smsusb_urb
typedef struct _smsusb_device
{
- struct usb_device* udev;
+ struct usb_device *udev;
smscore_device_t *coredev;
smsusb_urb_t surbs[MAX_URBS];
@@ -53,12 +53,12 @@ typedef struct _smsusb_device
int buffer_size;
} *psmsusb_device_t;
-int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb);
+int smsusb_submit_urb(smsusb_device_t *dev, smsusb_urb_t *surb);
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
void smsusb_onresponse(struct urb *urb)
#else
-void smsusb_onresponse(struct urb *urb, struct pt_regs * regs)
+void smsusb_onresponse(struct urb *urb, struct pt_regs *regs)
#endif
{
smsusb_urb_t *surb = (smsusb_urb_t *) urb->context;
@@ -108,7 +108,7 @@ exit_and_resubmit:
smsusb_submit_urb(dev, surb);
}
-int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb)
+int smsusb_submit_urb(smsusb_device_t *dev, smsusb_urb_t *surb)
{
if (!surb->cb)
{
@@ -135,7 +135,7 @@ int smsusb_submit_urb(smsusb_device_t* d
return usb_submit_urb(&surb->urb, GFP_ATOMIC);
}
-void smsusb_stop_streaming(smsusb_device_t* dev)
+void smsusb_stop_streaming(smsusb_device_t *dev)
{
int i;
@@ -151,7 +151,7 @@ void smsusb_stop_streaming(smsusb_device
}
}
-int smsusb_start_streaming(smsusb_device_t* dev)
+int smsusb_start_streaming(smsusb_device_t *dev)
{
int i, rc;
@@ -171,7 +171,7 @@ int smsusb_start_streaming(smsusb_device
int smsusb_sendrequest(void *context, void *buffer, size_t size)
{
- smsusb_device_t* dev = (smsusb_device_t*) context;
+ smsusb_device_t *dev = (smsusb_device_t *) context;
int dummy;
return usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2), buffer,
size, &dummy, 1000);
@@ -189,7 +189,7 @@ int smsusb1_load_firmware(struct usb_dev
int smsusb1_load_firmware(struct usb_device *udev, int id)
{
const struct firmware *fw;
- u8* fw_buffer;
+ u8 *fw_buffer;
int rc, dummy;
if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA)
@@ -289,7 +289,7 @@ int smsusb_init_device(struct usb_interf
int smsusb_init_device(struct usb_interface *intf)
{
smsdevice_params_t params;
- smsusb_device_t* dev;
+ smsusb_device_t *dev;
int i, rc;
// create device object
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/2637bbb78aba1e25274cec6c0ca32c560f80a84a
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
