Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f36f1b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE updates from David Miller:
 "Just a few small changes this merge window, marking ops const, printf
  string type fixes, etc"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers/ide: make ide-scan-pci.c driver explicitly non-modular
  ide: constify ide_dma_ops structures
  ide: silence some underflow warnings
parents c38dec71 e04a2bd6

drivers/ide/ide-scan-pci.c

+1 −2
Original line number Diff line number Diff line
@@ -107,5 +107,4 @@ static int __init ide_scan_pcibus(void) 


	return 0;

}



module_init(ide_scan_pcibus);
 
device_initcall(ide_scan_pcibus);

drivers/ide/ide.c

+8 −8
Original line number Diff line number Diff line
@@ -178,17 +178,17 @@ MODULE_PARM_DESC(pci_clock, "PCI bus clock frequency (in MHz)"); 


static int ide_set_dev_param_mask(const char *s, const struct kernel_param *kp)

{

	int a, b, i, j = 1;

	unsigned int a, b, i, j = 1;

	unsigned int *dev_param_mask = (unsigned int *)kp->arg;



	/* controller . device (0 or 1) [ : 1 (set) | 0 (clear) ] */

	if (sscanf(s, "%d.%d:%d", &a, &b, &j) != 3 &&

	    sscanf(s, "%d.%d", &a, &b) != 2)

	if (sscanf(s, "%u.%u:%u", &a, &b, &j) != 3 &&

	    sscanf(s, "%u.%u", &a, &b) != 2)

		return -EINVAL;



	i = a * MAX_DRIVES + b;



	if (i >= MAX_HWIFS * MAX_DRIVES || j < 0 || j > 1)

	if (i >= MAX_HWIFS * MAX_DRIVES || j > 1)

		return -EINVAL;



	if (j)
@@ -246,17 +246,17 @@ static struct chs_geom ide_disks_chs[MAX_HWIFS * MAX_DRIVES]; 


static int ide_set_disk_chs(const char *str, struct kernel_param *kp)

{

	int a, b, c = 0, h = 0, s = 0, i, j = 1;

	unsigned int a, b, c = 0, h = 0, s = 0, i, j = 1;



	/* controller . device (0 or 1) : Cylinders , Heads , Sectors */

	/* controller . device (0 or 1) : 1 (use CHS) | 0 (ignore CHS) */

	if (sscanf(str, "%d.%d:%d,%d,%d", &a, &b, &c, &h, &s) != 5 &&

	    sscanf(str, "%d.%d:%d", &a, &b, &j) != 3)

	if (sscanf(str, "%u.%u:%u,%u,%u", &a, &b, &c, &h, &s) != 5 &&

	    sscanf(str, "%u.%u:%u", &a, &b, &j) != 3)

		return -EINVAL;



	i = a * MAX_DRIVES + b;



	if (i >= MAX_HWIFS * MAX_DRIVES || j < 0 || j > 1)

	if (i >= MAX_HWIFS * MAX_DRIVES || j > 1)

		return -EINVAL;



	if (c > INT_MAX || h > 255 || s > 255)

drivers/ide/it821x.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void it821x_quirkproc(ide_drive_t *drive) 


}



static struct ide_dma_ops it821x_pass_through_dma_ops = {

static const struct ide_dma_ops it821x_pass_through_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_start		= it821x_dma_start,

drivers/ide/trm290.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static const struct ide_tp_ops trm290_tp_ops = { 
	.output_data		= ide_output_data,

};



static struct ide_dma_ops trm290_dma_ops = {

static const struct ide_dma_ops trm290_dma_ops = {

	.dma_host_set		= trm290_dma_host_set,

	.dma_setup 		= trm290_dma_setup,

	.dma_start 		= trm290_dma_start,