Commit 137cf5b2 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: rar: fix some initial type problems

parent 542385ee
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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) },
@@ -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,
@@ -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;
+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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);