Skip to content

Commit

Permalink
Staging: rar: fix some initial type problems
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 542385e commit 137cf5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/rar/rar_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static void __exit rar_exit_handler(void);
/*
function that is activated on the succesfull probe of the RAR device
*/
static int __devinit rar_probe(struct pci_dev *pdev, struct pci_device_id *ent);
static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent);

static struct pci_device_id rar_pci_id_tbl[] = {
{ PCI_DEVICE(VENDOR_ID, DEVICE_ID) },
Expand Down Expand Up @@ -311,7 +311,7 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
if(1) {
size_t z;
for (z = 0; z != MRST_NUM_RAR; ++z) {
printk(KERN_WARNING "rar - BRAR[%u] physical address low\n"
printk(KERN_WARNING "rar - BRAR[%Zd] physical address low\n"
"\tlow: 0x%08x\n"
"\thigh: 0x%08x\n",
z,
Expand All @@ -327,7 +327,7 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
/*
function that is activaed on the succesfull probe of the RAR device
*/
static int __devinit rar_probe(struct pci_dev *pdev, struct pci_device_id *ent)
static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
/* error */
int error;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/sep/sep_ext_with_pci_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ int sep_copy_cache_resident_to_area(unsigned long src_cache_addr,
"SEP Driver:cache data loc is %p\n",
(void *)fw->data);
DEBUG_PRINT_1(SEP_DEBUG_LEVEL_EXTENDED,
"SEP Driver:cache data size is %08x\n",
"SEP Driver:cache data size is %08Zx\n",
fw->size);

memcpy((void *)cache_virtual_address, (void *)fw->data, fw->size);
Expand All @@ -243,7 +243,7 @@ int sep_copy_cache_resident_to_area(unsigned long src_cache_addr,
"SEP Driver:res data loc is %p\n",
(void *)fw->data);
DEBUG_PRINT_1(SEP_DEBUG_LEVEL_EXTENDED,
"SEP Driver:res data size is %08x\n",
"SEP Driver:res data size is %08Zx\n",
fw->size);

memcpy((void *)resident_virtual_address, (void *)fw->data, fw->size);
Expand Down

0 comments on commit 137cf5b

Please sign in to comment.