~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,13 +1,9 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	*
3	4	* Linux MegaRAID device driver
4	5	*
5	6	* Copyright (c) 2002 LSI Logic Corporation.
6		- *
7		- * This program is free software; you can redistribute it and/or
8		- * modify it under the terms of the GNU General Public License
9		- * as published by the Free Software Foundation; either version
10		- * 2 of the License, or (at your option) any later version.
11	7	*
12	8	* Copyright (c) 2002 Red Hat, Inc. All rights reserved.
13	9	* - fixes
..	..	@@ -28,7 +24,6 @@
28	24	* This driver is supported by LSI Logic, with assistance from Red Hat, Dell,
29	25	* and others. Please send updates to the mailing list
30	26	* linux-scsi@vger.kernel.org .
31		- *
32	27	*/
33	28
34	29	#include <linux/mm.h>
..	..	@@ -129,7 +124,7 @@
129	124
130	125	/**
131	126	* mega_setup_mailbox()
132		- * @adapter - pointer to our soft state
	127	+ * @adapter: pointer to our soft state
133	128	*
134	129	* Allocates a 8 byte aligned memory for the handshake mailbox.
135	130	*/
..	..	@@ -138,8 +133,10 @@
138	133	{
139	134	unsigned long align;
140	135
141		- adapter->una_mbox64 = pci_alloc_consistent(adapter->dev,
142		- sizeof(mbox64_t), &adapter->una_mbox64_dma);
	136	+ adapter->una_mbox64 = dma_alloc_coherent(&adapter->dev->dev,
	137	+ sizeof(mbox64_t),
	138	+ &adapter->una_mbox64_dma,
	139	+ GFP_KERNEL);
143	140
144	141	if( !adapter->una_mbox64 ) return -1;
145	142
..	..	@@ -227,8 +224,9 @@
227	224	mraid_inquiry *inq;
228	225	dma_addr_t dma_handle;
229	226
230		- ext_inq = pci_alloc_consistent(adapter->dev,
231		- sizeof(mraid_ext_inquiry), &dma_handle);
	227	+ ext_inq = dma_alloc_coherent(&adapter->dev->dev,
	228	+ sizeof(mraid_ext_inquiry),
	229	+ &dma_handle, GFP_KERNEL);
232	230
233	231	if( ext_inq == NULL ) return -1;
234	232
..	..	@@ -248,8 +246,9 @@
248	246	mega_8_to_40ld(inq, inquiry3,
249	247	(mega_product_info *)&adapter->product_info);
250	248
251		- pci_free_consistent(adapter->dev, sizeof(mraid_ext_inquiry),
252		- ext_inq, dma_handle);
	249	+ dma_free_coherent(&adapter->dev->dev,
	250	+ sizeof(mraid_ext_inquiry), ext_inq,
	251	+ dma_handle);
253	252
254	253	} else { /adapter supports 40ld /
255	254	adapter->flag \|= BOARD_40LD;
..	..	@@ -258,9 +257,10 @@
258	257	* get product_info, which is static information and will be
259	258	* unchanged
260	259	*/
261		- prod_info_dma_handle = pci_map_single(adapter->dev, (void *)
262		- &adapter->product_info,
263		- sizeof(mega_product_info), PCI_DMA_FROMDEVICE);
	260	+ prod_info_dma_handle = dma_map_single(&adapter->dev->dev,
	261	+ (void *)&adapter->product_info,
	262	+ sizeof(mega_product_info),
	263	+ DMA_FROM_DEVICE);
264	264
265	265	mbox->m_out.xferaddr = prod_info_dma_handle;
266	266
..	..	@@ -272,8 +272,8 @@
272	272	"Product_info cmd failed with error: %d\n",
273	273	retval);
274	274
275		- pci_unmap_single(adapter->dev, prod_info_dma_handle,
276		- sizeof(mega_product_info), PCI_DMA_FROMDEVICE);
	275	+ dma_unmap_single(&adapter->dev->dev, prod_info_dma_handle,
	276	+ sizeof(mega_product_info), DMA_FROM_DEVICE);
277	277	}
278	278
279	279
..	..	@@ -352,7 +352,7 @@
352	352
353	353	/**
354	354	* mega_runpendq()
355		- * @adapter - pointer to our soft state
	355	+ * @adapter: pointer to our soft state
356	356	*
357	357	* Runs through the list of pending requests.
358	358	*/
..	..	@@ -418,8 +418,8 @@
418	418
419	419	/**
420	420	* mega_allocate_scb()
421		- * @adapter - pointer to our soft state
422		- * @cmd - scsi command from the mid-layer
	421	+ * @adapter: pointer to our soft state
	422	+ * @cmd: scsi command from the mid-layer
423	423	*
424	424	* Allocate a SCB structure. This is the central structure for controller
425	425	* commands.
..	..	@@ -449,9 +449,9 @@
449	449
450	450	/**
451	451	* mega_get_ldrv_num()
452		- * @adapter - pointer to our soft state
453		- * @cmd - scsi mid layer command
454		- * @channel - channel on the controller
	452	+ * @adapter: pointer to our soft state
	453	+ * @cmd: scsi mid layer command
	454	+ * @channel: channel on the controller
455	455	*
456	456	* Calculate the logical drive number based on the information in scsi command
457	457	* and the channel number.
..	..	@@ -496,9 +496,9 @@
496	496
497	497	if (adapter->support_random_del && adapter->read_ldidmap )
498	498	switch (cmd->cmnd[0]) {
499		- case READ_6: /* fall through */
500		- case WRITE_6: /* fall through */
501		- case READ_10: /* fall through */
	499	+ case READ_6:
	500	+ case WRITE_6:
	501	+ case READ_10:
502	502	case WRITE_10:
503	503	ldrv_num += 0x80;
504	504	}
..	..	@@ -508,9 +508,9 @@
508	508
509	509	/**
510	510	* mega_build_cmd()
511		- * @adapter - pointer to our soft state
512		- * @cmd - Prepare using this scsi command
513		- * @busy - busy flag if no resources
	511	+ * @adapter: pointer to our soft state
	512	+ * @cmd: Prepare using this scsi command
	513	+ * @busy: busy flag if no resources
514	514	*
515	515	* Prepares a command and scatter gather list for the controller. This routine
516	516	* also finds out if the commands is intended for a logical drive or a
..	..	@@ -522,7 +522,6 @@
522	522	static scb_t *
523	523	mega_build_cmd(adapter_t adapter, struct scsi_cmnd cmd, int *busy)
524	524	{
525		- mega_ext_passthru *epthru;
526	525	mega_passthru *pthru;
527	526	scb_t *scb;
528	527	mbox_t *mbox;
..	..	@@ -651,7 +650,7 @@
651	650	scb->raw_mbox[2] = MEGA_RESERVATION_STATUS;
652	651	scb->raw_mbox[3] = ldrv_num;
653	652
654		- scb->dma_direction = PCI_DMA_NONE;
	653	+ scb->dma_direction = DMA_NONE;
655	654
656	655	return scb;
657	656	#else
..	..	@@ -715,7 +714,7 @@
715	714	mbox->m_out.cmd = MEGA_MBOXCMD_PASSTHRU;
716	715	}
717	716
718		- scb->dma_direction = PCI_DMA_FROMDEVICE;
	717	+ scb->dma_direction = DMA_FROM_DEVICE;
719	718
720	719	pthru->numsgelements = mega_build_sglist(adapter, scb,
721	720	&pthru->dataxferaddr, &pthru->dataxferlen);
..	..	@@ -845,10 +844,10 @@
845	844	* If it is a read command
846	845	*/
847	846	if( (*cmd->cmnd & 0x0F) == 0x08 ) {
848		- scb->dma_direction = PCI_DMA_FROMDEVICE;
	847	+ scb->dma_direction = DMA_FROM_DEVICE;
849	848	}
850	849	else {
851		- scb->dma_direction = PCI_DMA_TODEVICE;
	850	+ scb->dma_direction = DMA_TO_DEVICE;
852	851	}
853	852
854	853	/* Calculate Scatter-Gather info */
..	..	@@ -858,7 +857,7 @@
858	857	return scb;
859	858
860	859	#if MEGA_HAVE_CLUSTERING
861		- case RESERVE: /* Fall through */
	860	+ case RESERVE:
862	861	case RELEASE:
863	862
864	863	/*
..	..	@@ -883,7 +882,7 @@
883	882
884	883	scb->raw_mbox[3] = ldrv_num;
885	884
886		- scb->dma_direction = PCI_DMA_NONE;
	885	+ scb->dma_direction = DMA_NONE;
887	886
888	887	return scb;
889	888	#endif
..	..	@@ -910,7 +909,7 @@
910	909
911	910	if( adapter->support_ext_cdb ) {
912	911
913		- epthru = mega_prepare_extpassthru(adapter, scb, cmd,
	912	+ mega_prepare_extpassthru(adapter, scb, cmd,
914	913	channel, target);
915	914
916	915	mbox->m_out.cmd = MEGA_MBOXCMD_EXTPTHRU;
..	..	@@ -942,11 +941,11 @@
942	941
943	942	/**
944	943	* mega_prepare_passthru()
945		- * @adapter - pointer to our soft state
946		- * @scb - our scsi control block
947		- * @cmd - scsi command from the mid-layer
948		- * @channel - actual channel on the controller
949		- * @target - actual id on the controller.
	944	+ * @adapter: pointer to our soft state
	945	+ * @scb: our scsi control block
	946	+ * @cmd: scsi command from the mid-layer
	947	+ * @channel: actual channel on the controller
	948	+ * @target: actual id on the controller.
950	949	*
951	950	* prepare a command for the scsi physical devices.
952	951	*/
..	..	@@ -977,7 +976,7 @@
977	976	memcpy(pthru->cdb, cmd->cmnd, cmd->cmd_len);
978	977
979	978	/* Not sure about the direction */
980		- scb->dma_direction = PCI_DMA_BIDIRECTIONAL;
	979	+ scb->dma_direction = DMA_BIDIRECTIONAL;
981	980
982	981	/* Special Code for Handling READ_CAPA/ INQ using bounce buffers */
983	982	switch (cmd->cmnd[0]) {
..	..	@@ -993,7 +992,7 @@
993	992
994	993	adapter->flag \|= (1L << cmd->device->channel);
995	994	}
996		- /* Fall through */
	995	+ fallthrough;
997	996	default:
998	997	pthru->numsgelements = mega_build_sglist(adapter, scb,
999	998	&pthru->dataxferaddr, &pthru->dataxferlen);
..	..	@@ -1005,11 +1004,11 @@
1005	1004
1006	1005	/**
1007	1006	* mega_prepare_extpassthru()
1008		- * @adapter - pointer to our soft state
1009		- * @scb - our scsi control block
1010		- * @cmd - scsi command from the mid-layer
1011		- * @channel - actual channel on the controller
1012		- * @target - actual id on the controller.
	1007	+ * @adapter: pointer to our soft state
	1008	+ * @scb: our scsi control block
	1009	+ * @cmd: scsi command from the mid-layer
	1010	+ * @channel: actual channel on the controller
	1011	+ * @target: actual id on the controller.
1013	1012	*
1014	1013	* prepare a command for the scsi physical devices. This rountine prepares
1015	1014	* commands for devices which can take extended CDBs (>10 bytes)
..	..	@@ -1041,7 +1040,7 @@
1041	1040	memcpy(epthru->cdb, cmd->cmnd, cmd->cmd_len);
1042	1041
1043	1042	/* Not sure about the direction */
1044		- scb->dma_direction = PCI_DMA_BIDIRECTIONAL;
	1043	+ scb->dma_direction = DMA_BIDIRECTIONAL;
1045	1044
1046	1045	switch(cmd->cmnd[0]) {
1047	1046	case INQUIRY:
..	..	@@ -1056,7 +1055,7 @@
1056	1055
1057	1056	adapter->flag \|= (1L << cmd->device->channel);
1058	1057	}
1059		- /* Fall through */
	1058	+ fallthrough;
1060	1059	default:
1061	1060	epthru->numsgelements = mega_build_sglist(adapter, scb,
1062	1061	&epthru->dataxferaddr, &epthru->dataxferlen);
..	..	@@ -1090,8 +1089,8 @@
1090	1089
1091	1090	/**
1092	1091	* issue_scb()
1093		- * @adapter - pointer to our soft state
1094		- * @scb - scsi control block
	1092	+ * @adapter: pointer to our soft state
	1093	+ * @scb: scsi control block
1095	1094	*
1096	1095	* Post a command to the card if the mailbox is available, otherwise return
1097	1096	* busy. We also take the scb from the pending list if the mailbox is
..	..	@@ -1171,8 +1170,8 @@
1171	1170
1172	1171	/**
1173	1172	* issue_scb_block()
1174		- * @adapter - pointer to our soft state
1175		- * @raw_mbox - the mailbox
	1173	+ * @adapter: pointer to our soft state
	1174	+ * @raw_mbox: the mailbox
1176	1175	*
1177	1176	* Issue a scb in synchronous and non-interrupt mode
1178	1177	*/
..	..	@@ -1252,8 +1251,8 @@
1252	1251
1253	1252	/**
1254	1253	* megaraid_isr_iomapped()
1255		- * @irq - irq
1256		- * @devp - pointer to our soft state
	1254	+ * @irq: irq
	1255	+ * @devp: pointer to our soft state
1257	1256	*
1258	1257	* Interrupt service routine for io-mapped controllers.
1259	1258	* Find out if our device is interrupting. If yes, acknowledge the interrupt
..	..	@@ -1328,8 +1327,8 @@
1328	1327
1329	1328	/**
1330	1329	* megaraid_isr_memmapped()
1331		- * @irq - irq
1332		- * @devp - pointer to our soft state
	1330	+ * @irq: irq
	1331	+ * @devp: pointer to our soft state
1333	1332	*
1334	1333	* Interrupt service routine for memory-mapped controllers.
1335	1334	* Find out if our device is interrupting. If yes, acknowledge the interrupt
..	..	@@ -1406,10 +1405,10 @@
1406	1405	}
1407	1406	/**
1408	1407	* mega_cmd_done()
1409		- * @adapter - pointer to our soft state
1410		- * @completed - array of ids of completed commands
1411		- * @nstatus - number of completed commands
1412		- * @status - status of the last command completed
	1408	+ * @adapter: pointer to our soft state
	1409	+ * @completed: array of ids of completed commands
	1410	+ * @nstatus: number of completed commands
	1411	+ * @status: status of the last command completed
1413	1412	*
1414	1413	* Complete the commands and call the scsi mid-layer callback hooks.
1415	1414	*/
..	..	@@ -1819,25 +1818,25 @@
1819	1818	scb = &adapter->scb_list[i];
1820	1819
1821	1820	if( scb->sgl64 ) {
1822		- pci_free_consistent(adapter->dev,
1823		- sizeof(mega_sgl64) * adapter->sglen,
1824		- scb->sgl64,
1825		- scb->sgl_dma_addr);
	1821	+ dma_free_coherent(&adapter->dev->dev,
	1822	+ sizeof(mega_sgl64) * adapter->sglen,
	1823	+ scb->sgl64, scb->sgl_dma_addr);
1826	1824
1827	1825	scb->sgl64 = NULL;
1828	1826	}
1829	1827
1830	1828	if( scb->pthru ) {
1831		- pci_free_consistent(adapter->dev, sizeof(mega_passthru),
1832		- scb->pthru, scb->pthru_dma_addr);
	1829	+ dma_free_coherent(&adapter->dev->dev,
	1830	+ sizeof(mega_passthru), scb->pthru,
	1831	+ scb->pthru_dma_addr);
1833	1832
1834	1833	scb->pthru = NULL;
1835	1834	}
1836	1835
1837	1836	if( scb->epthru ) {
1838		- pci_free_consistent(adapter->dev,
1839		- sizeof(mega_ext_passthru),
1840		- scb->epthru, scb->epthru_dma_addr);
	1837	+ dma_free_coherent(&adapter->dev->dev,
	1838	+ sizeof(mega_ext_passthru),
	1839	+ scb->epthru, scb->epthru_dma_addr);
1841	1840
1842	1841	scb->epthru = NULL;
1843	1842	}
..	..	@@ -1926,9 +1925,9 @@
1926	1925
1927	1926	/**
1928	1927	* megaraid_abort_and_reset()
1929		- * @adapter - megaraid soft state
1930		- * @cmd - scsi command to be aborted or reset
1931		- * @aor - abort or reset flag
	1928	+ * @adapter: megaraid soft state
	1929	+ * @cmd: scsi command to be aborted or reset
	1930	+ * @aor: abort or reset flag
1932	1931	*
1933	1932	* Try to locate the scsi command in the pending queue. If found and is not
1934	1933	* issued to the controller, abort/reset it. Otherwise return failure
..	..	@@ -2010,7 +2009,7 @@
2010	2009
2011	2010	memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
2012	2011
2013		- if( pci_set_dma_mask(*pdev, DMA_BIT_MASK(32)) != 0 ) {
	2012	+ if (dma_set_mask(&(*pdev)->dev, DMA_BIT_MASK(32)) != 0) {
2014	2013	kfree(*pdev);
2015	2014	return -1;
2016	2015	}
..	..	@@ -2026,22 +2025,24 @@
2026	2025
2027	2026	/**
2028	2027	* mega_allocate_inquiry()
2029		- * @dma_handle - handle returned for dma address
2030		- * @pdev - handle to pci device
	2028	+ * @dma_handle: handle returned for dma address
	2029	+ * @pdev: handle to pci device
2031	2030	*
2032	2031	* allocates memory for inquiry structure
2033	2032	*/
2034	2033	static inline void *
2035	2034	mega_allocate_inquiry(dma_addr_t dma_handle, struct pci_dev pdev)
2036	2035	{
2037		- return pci_alloc_consistent(pdev, sizeof(mega_inquiry3), dma_handle);
	2036	+ return dma_alloc_coherent(&pdev->dev, sizeof(mega_inquiry3),
	2037	+ dma_handle, GFP_KERNEL);
2038	2038	}
2039	2039
2040	2040
2041	2041	static inline void
2042	2042	mega_free_inquiry(void inquiry, dma_addr_t dma_handle, struct pci_dev pdev)
2043	2043	{
2044		- pci_free_consistent(pdev, sizeof(mega_inquiry3), inquiry, dma_handle);
	2044	+ dma_free_coherent(&pdev->dev, sizeof(mega_inquiry3), inquiry,
	2045	+ dma_handle);
2045	2046	}
2046	2047
2047	2048
..	..	@@ -2050,8 +2051,8 @@
2050	2051
2051	2052	/**
2052	2053	* proc_show_config()
2053		- * @m - Synthetic file construction data
2054		- * @v - File iterator
	2054	+ * @m: Synthetic file construction data
	2055	+ * @v: File iterator
2055	2056	*
2056	2057	* Display configuration information about the controller.
2057	2058	*/
..	..	@@ -2114,8 +2115,8 @@
2114	2115
2115	2116	/**
2116	2117	* proc_show_stat()
2117		- * @m - Synthetic file construction data
2118		- * @v - File iterator
	2118	+ * @m: Synthetic file construction data
	2119	+ * @v: File iterator
2119	2120	*
2120	2121	* Display statistical information about the I/O activity.
2121	2122	*/
..	..	@@ -2148,8 +2149,8 @@
2148	2149
2149	2150	/**
2150	2151	* proc_show_mbox()
2151		- * @m - Synthetic file construction data
2152		- * @v - File iterator
	2152	+ * @m: Synthetic file construction data
	2153	+ * @v: File iterator
2153	2154	*
2154	2155	* Display mailbox information for the last command issued. This information
2155	2156	* is good for debugging.
..	..	@@ -2176,8 +2177,8 @@
2176	2177
2177	2178	/**
2178	2179	* proc_show_rebuild_rate()
2179		- * @m - Synthetic file construction data
2180		- * @v - File iterator
	2180	+ * @m: Synthetic file construction data
	2181	+ * @v: File iterator
2181	2182	*
2182	2183	* Display current rebuild rate
2183	2184	*/
..	..	@@ -2219,8 +2220,8 @@
2219	2220
2220	2221	/**
2221	2222	* proc_show_battery()
2222		- * @m - Synthetic file construction data
2223		- * @v - File iterator
	2223	+ * @m: Synthetic file construction data
	2224	+ * @v: File iterator
2224	2225	*
2225	2226	* Display information about the battery module on the controller.
2226	2227	*/
..	..	@@ -2322,9 +2323,9 @@
2322	2323
2323	2324	/**
2324	2325	* proc_show_pdrv()
2325		- * @m - Synthetic file construction data
2326		- * @page - buffer to write the data in
2327		- * @adapter - pointer to our soft state
	2326	+ * @m: Synthetic file construction data
	2327	+ * @adapter: pointer to our soft state
	2328	+ * @channel: channel
2328	2329	*
2329	2330	* Display information about the physical drives.
2330	2331	*/
..	..	@@ -2355,7 +2356,8 @@
2355	2356	}
2356	2357
2357	2358
2358		- scsi_inq = pci_alloc_consistent(pdev, 256, &scsi_inq_dma_handle);
	2359	+ scsi_inq = dma_alloc_coherent(&pdev->dev, 256, &scsi_inq_dma_handle,
	2360	+ GFP_KERNEL);
2359	2361	if( scsi_inq == NULL ) {
2360	2362	seq_puts(m, "memory not available for scsi inq.\n");
2361	2363	goto free_inquiry;
..	..	@@ -2428,7 +2430,7 @@
2428	2430	}
2429	2431
2430	2432	free_pci:
2431		- pci_free_consistent(pdev, 256, scsi_inq, scsi_inq_dma_handle);
	2433	+ dma_free_coherent(&pdev->dev, 256, scsi_inq, scsi_inq_dma_handle);
2432	2434	free_inquiry:
2433	2435	mega_free_inquiry(inquiry, dma_handle, pdev);
2434	2436	free_pdev:
..	..	@@ -2438,8 +2440,8 @@
2438	2440
2439	2441	/**
2440	2442	* proc_show_pdrv_ch0()
2441		- * @m - Synthetic file construction data
2442		- * @v - File iterator
	2443	+ * @m: Synthetic file construction data
	2444	+ * @v: File iterator
2443	2445	*
2444	2446	* Display information about the physical drives on physical channel 0.
2445	2447	*/
..	..	@@ -2452,8 +2454,8 @@
2452	2454
2453	2455	/**
2454	2456	* proc_show_pdrv_ch1()
2455		- * @m - Synthetic file construction data
2456		- * @v - File iterator
	2457	+ * @m: Synthetic file construction data
	2458	+ * @v: File iterator
2457	2459	*
2458	2460	* Display information about the physical drives on physical channel 1.
2459	2461	*/
..	..	@@ -2466,8 +2468,8 @@
2466	2468
2467	2469	/**
2468	2470	* proc_show_pdrv_ch2()
2469		- * @m - Synthetic file construction data
2470		- * @v - File iterator
	2471	+ * @m: Synthetic file construction data
	2472	+ * @v: File iterator
2471	2473	*
2472	2474	* Display information about the physical drives on physical channel 2.
2473	2475	*/
..	..	@@ -2480,8 +2482,8 @@
2480	2482
2481	2483	/**
2482	2484	* proc_show_pdrv_ch3()
2483		- * @m - Synthetic file construction data
2484		- * @v - File iterator
	2485	+ * @m: Synthetic file construction data
	2486	+ * @v: File iterator
2485	2487	*
2486	2488	* Display information about the physical drives on physical channel 3.
2487	2489	*/
..	..	@@ -2494,10 +2496,10 @@
2494	2496
2495	2497	/**
2496	2498	* proc_show_rdrv()
2497		- * @m - Synthetic file construction data
2498		- * @adapter - pointer to our soft state
2499		- * @start - starting logical drive to display
2500		- * @end - ending logical drive to display
	2499	+ * @m: Synthetic file construction data
	2500	+ * @adapter: pointer to our soft state
	2501	+ * @start: starting logical drive to display
	2502	+ * @end: ending logical drive to display
2501	2503	*
2502	2504	* We do not print the inquiry information since its already available through
2503	2505	* /proc/scsi/scsi interface
..	..	@@ -2548,8 +2550,8 @@
2548	2550	raid_inq.logdrv_info.num_ldrv;
2549	2551	}
2550	2552
2551		- disk_array = pci_alloc_consistent(pdev, array_sz,
2552		- &disk_array_dma_handle);
	2553	+ disk_array = dma_alloc_coherent(&pdev->dev, array_sz,
	2554	+ &disk_array_dma_handle, GFP_KERNEL);
2553	2555
2554	2556	if( disk_array == NULL ) {
2555	2557	seq_puts(m, "memory not available.\n");
..	..	@@ -2668,8 +2670,8 @@
2668	2670	}
2669	2671
2670	2672	free_pci:
2671		- pci_free_consistent(pdev, array_sz, disk_array,
2672		- disk_array_dma_handle);
	2673	+ dma_free_coherent(&pdev->dev, array_sz, disk_array,
	2674	+ disk_array_dma_handle);
2673	2675	free_inquiry:
2674	2676	mega_free_inquiry(inquiry, dma_handle, pdev);
2675	2677	free_pdev:
..	..	@@ -2679,8 +2681,8 @@
2679	2681
2680	2682	/**
2681	2683	* proc_show_rdrv_10()
2682		- * @m - Synthetic file construction data
2683		- * @v - File iterator
	2684	+ * @m: Synthetic file construction data
	2685	+ * @v: File iterator
2684	2686	*
2685	2687	* Display real time information about the logical drives 0 through 9.
2686	2688	*/
..	..	@@ -2693,8 +2695,8 @@
2693	2695
2694	2696	/**
2695	2697	* proc_show_rdrv_20()
2696		- * @m - Synthetic file construction data
2697		- * @v - File iterator
	2698	+ * @m: Synthetic file construction data
	2699	+ * @v: File iterator
2698	2700	*
2699	2701	* Display real time information about the logical drives 0 through 9.
2700	2702	*/
..	..	@@ -2707,8 +2709,8 @@
2707	2709
2708	2710	/**
2709	2711	* proc_show_rdrv_30()
2710		- * @m - Synthetic file construction data
2711		- * @v - File iterator
	2712	+ * @m: Synthetic file construction data
	2713	+ * @v: File iterator
2712	2714	*
2713	2715	* Display real time information about the logical drives 0 through 9.
2714	2716	*/
..	..	@@ -2721,8 +2723,8 @@
2721	2723
2722	2724	/**
2723	2725	* proc_show_rdrv_40()
2724		- * @m - Synthetic file construction data
2725		- * @v - File iterator
	2726	+ * @m: Synthetic file construction data
	2727	+ * @v: File iterator
2726	2728	*
2727	2729	* Display real time information about the logical drives 0 through 9.
2728	2730	*/
..	..	@@ -2734,8 +2736,8 @@
2734	2736
2735	2737	/**
2736	2738	* mega_create_proc_entry()
2737		- * @index - index in soft state array
2738		- * @parent - parent node for this /proc entry
	2739	+ * @index: index in soft state array
	2740	+ * @parent: parent node for this /proc entry
2739	2741	*
2740	2742	* Creates /proc entries for our controllers.
2741	2743	*/
..	..	@@ -2790,7 +2792,7 @@
2790	2792	#endif
2791	2793
2792	2794
2793		-/**
	2795	+/*
2794	2796	* megaraid_biosparam()
2795	2797	*
2796	2798	* Return the disk geometry for a particular disk
..	..	@@ -2800,11 +2802,9 @@
2800	2802	sector_t capacity, int geom[])
2801	2803	{
2802	2804	adapter_t *adapter;
2803		- unsigned char *bh;
2804	2805	int heads;
2805	2806	int sectors;
2806	2807	int cylinders;
2807		- int rval;
2808	2808
2809	2809	/* Get pointer to host config structure */
2810	2810	adapter = (adapter_t *)sdev->host->hostdata;
..	..	@@ -2831,15 +2831,8 @@
2831	2831	geom[2] = cylinders;
2832	2832	}
2833	2833	else {
2834		- bh = scsi_bios_ptable(bdev);
2835		-
2836		- if( bh ) {
2837		- rval = scsi_partsize(bh, capacity,
2838		- &geom[2], &geom[0], &geom[1]);
2839		- kfree(bh);
2840		- if( rval != -1 )
2841		- return rval;
2842		- }
	2834	+ if (scsi_partsize(bdev, capacity, geom))
	2835	+ return 0;
2843	2836
2844	2837	dev_info(&adapter->dev->dev,
2845	2838	"invalid partition on this disk on channel %d\n",
..	..	@@ -2868,7 +2861,7 @@
2868	2861
2869	2862	/**
2870	2863	* mega_init_scb()
2871		- * @adapter - pointer to our soft state
	2864	+ * @adapter: pointer to our soft state
2872	2865	*
2873	2866	* Allocate memory for the various pointers in the scb structures:
2874	2867	* scatter-gather list pointer, passthru and extended passthru structure
..	..	@@ -2896,9 +2889,9 @@
2896	2889
2897	2890	scb->idx = i;
2898	2891
2899		- scb->sgl64 = pci_alloc_consistent(adapter->dev,
2900		- sizeof(mega_sgl64) * adapter->sglen,
2901		- &scb->sgl_dma_addr);
	2892	+ scb->sgl64 = dma_alloc_coherent(&adapter->dev->dev,
	2893	+ sizeof(mega_sgl64) * adapter->sglen,
	2894	+ &scb->sgl_dma_addr, GFP_KERNEL);
2902	2895
2903	2896	scb->sgl = (mega_sglist *)scb->sgl64;
2904	2897
..	..	@@ -2908,9 +2901,9 @@
2908	2901	return -1;
2909	2902	}
2910	2903
2911		- scb->pthru = pci_alloc_consistent(adapter->dev,
2912		- sizeof(mega_passthru),
2913		- &scb->pthru_dma_addr);
	2904	+ scb->pthru = dma_alloc_coherent(&adapter->dev->dev,
	2905	+ sizeof(mega_passthru),
	2906	+ &scb->pthru_dma_addr, GFP_KERNEL);
2914	2907
2915	2908	if( !scb->pthru ) {
2916	2909	dev_warn(&adapter->dev->dev, "RAID: Can't allocate passthru\n");
..	..	@@ -2918,9 +2911,9 @@
2918	2911	return -1;
2919	2912	}
2920	2913
2921		- scb->epthru = pci_alloc_consistent(adapter->dev,
2922		- sizeof(mega_ext_passthru),
2923		- &scb->epthru_dma_addr);
	2914	+ scb->epthru = dma_alloc_coherent(&adapter->dev->dev,
	2915	+ sizeof(mega_ext_passthru),
	2916	+ &scb->epthru_dma_addr, GFP_KERNEL);
2924	2917
2925	2918	if( !scb->epthru ) {
2926	2919	dev_warn(&adapter->dev->dev,
..	..	@@ -2948,8 +2941,8 @@
2948	2941
2949	2942	/**
2950	2943	* megadev_open()
2951		- * @inode - unused
2952		- * @filep - unused
	2944	+ * @inode: unused
	2945	+ * @filep: unused
2953	2946	*
2954	2947	* Routines for the character/ioctl interface to the driver. Find out if this
2955	2948	* is a valid open.
..	..	@@ -2968,10 +2961,9 @@
2968	2961
2969	2962	/**
2970	2963	* megadev_ioctl()
2971		- * @inode - Our device inode
2972		- * @filep - unused
2973		- * @cmd - ioctl command
2974		- * @arg - user buffer
	2964	+ * @filep: Our device file
	2965	+ * @cmd: ioctl command
	2966	+ * @arg: user buffer
2975	2967	*
2976	2968	* ioctl entry point for our private ioctl interface. We move the data in from
2977	2969	* the user space, prepare the command (if necessary, convert the old MIMD
..	..	@@ -2991,13 +2983,12 @@
2991	2983	void data = NULL; / data to be transferred */
2992	2984	dma_addr_t data_dma_hndl; /* dma handle for data xfer area */
2993	2985	megacmd_t mc;
2994		- megastat_t __user *ustats;
2995		- int num_ldrv;
	2986	+#if MEGA_HAVE_STATS
	2987	+ megastat_t __user *ustats = NULL;
	2988	+ int num_ldrv = 0;
	2989	+#endif
2996	2990	u32 uxferaddr = 0;
2997	2991	struct pci_dev *pdev;
2998		-
2999		- ustats = NULL; /* avoid compilation warnings */
3000		- num_ldrv = 0;
3001	2992
3002	2993	/*
3003	2994	* Make sure only USCSICMD are issued through this interface.
..	..	@@ -3162,9 +3153,9 @@
3162	3153	if( uioc.uioc_rmbox[0] == MEGA_MBOXCMD_PASSTHRU ) {
3163	3154	/* Passthru commands */
3164	3155
3165		- pthru = pci_alloc_consistent(pdev,
3166		- sizeof(mega_passthru),
3167		- &pthru_dma_hndl);
	3156	+ pthru = dma_alloc_coherent(&pdev->dev,
	3157	+ sizeof(mega_passthru),
	3158	+ &pthru_dma_hndl, GFP_KERNEL);
3168	3159
3169	3160	if( pthru == NULL ) {
3170	3161	free_local_pdev(pdev);
..	..	@@ -3182,9 +3173,9 @@
3182	3173	if( copy_from_user(pthru, upthru,
3183	3174	sizeof(mega_passthru)) ) {
3184	3175
3185		- pci_free_consistent(pdev,
3186		- sizeof(mega_passthru), pthru,
3187		- pthru_dma_hndl);
	3176	+ dma_free_coherent(&pdev->dev,
	3177	+ sizeof(mega_passthru),
	3178	+ pthru, pthru_dma_hndl);
3188	3179
3189	3180	free_local_pdev(pdev);
3190	3181
..	..	@@ -3195,15 +3186,16 @@
3195	3186	* Is there a data transfer
3196	3187	*/
3197	3188	if( pthru->dataxferlen ) {
3198		- data = pci_alloc_consistent(pdev,
3199		- pthru->dataxferlen,
3200		- &data_dma_hndl);
	3189	+ data = dma_alloc_coherent(&pdev->dev,
	3190	+ pthru->dataxferlen,
	3191	+ &data_dma_hndl,
	3192	+ GFP_KERNEL);
3201	3193
3202	3194	if( data == NULL ) {
3203		- pci_free_consistent(pdev,
3204		- sizeof(mega_passthru),
3205		- pthru,
3206		- pthru_dma_hndl);
	3195	+ dma_free_coherent(&pdev->dev,
	3196	+ sizeof(mega_passthru),
	3197	+ pthru,
	3198	+ pthru_dma_hndl);
3207	3199
3208	3200	free_local_pdev(pdev);
3209	3201
..	..	@@ -3268,13 +3260,13 @@
3268	3260
3269	3261	freemem_and_return:
3270	3262	if( pthru->dataxferlen ) {
3271		- pci_free_consistent(pdev,
3272		- pthru->dataxferlen, data,
3273		- data_dma_hndl);
	3263	+ dma_free_coherent(&pdev->dev,
	3264	+ pthru->dataxferlen, data,
	3265	+ data_dma_hndl);
3274	3266	}
3275	3267
3276		- pci_free_consistent(pdev, sizeof(mega_passthru),
3277		- pthru, pthru_dma_hndl);
	3268	+ dma_free_coherent(&pdev->dev, sizeof(mega_passthru),
	3269	+ pthru, pthru_dma_hndl);
3278	3270
3279	3271	free_local_pdev(pdev);
3280	3272
..	..	@@ -3287,8 +3279,10 @@
3287	3279	* Is there a data transfer
3288	3280	*/
3289	3281	if( uioc.xferlen ) {
3290		- data = pci_alloc_consistent(pdev,
3291		- uioc.xferlen, &data_dma_hndl);
	3282	+ data = dma_alloc_coherent(&pdev->dev,
	3283	+ uioc.xferlen,
	3284	+ &data_dma_hndl,
	3285	+ GFP_KERNEL);
3292	3286
3293	3287	if( data == NULL ) {
3294	3288	free_local_pdev(pdev);
..	..	@@ -3308,9 +3302,9 @@
3308	3302	if( copy_from_user(data, (char __user *)(unsigned long) uxferaddr,
3309	3303	uioc.xferlen) ) {
3310	3304
3311		- pci_free_consistent(pdev,
3312		- uioc.xferlen,
3313		- data, data_dma_hndl);
	3305	+ dma_free_coherent(&pdev->dev,
	3306	+ uioc.xferlen, data,
	3307	+ data_dma_hndl);
3314	3308
3315	3309	free_local_pdev(pdev);
3316	3310
..	..	@@ -3331,9 +3325,9 @@
3331	3325
3332	3326	if( rval ) {
3333	3327	if( uioc.xferlen ) {
3334		- pci_free_consistent(pdev,
3335		- uioc.xferlen, data,
3336		- data_dma_hndl);
	3328	+ dma_free_coherent(&pdev->dev,
	3329	+ uioc.xferlen, data,
	3330	+ data_dma_hndl);
3337	3331	}
3338	3332
3339	3333	free_local_pdev(pdev);
..	..	@@ -3353,9 +3347,8 @@
3353	3347	}
3354	3348
3355	3349	if( uioc.xferlen ) {
3356		- pci_free_consistent(pdev,
3357		- uioc.xferlen, data,
3358		- data_dma_hndl);
	3350	+ dma_free_coherent(&pdev->dev, uioc.xferlen,
	3351	+ data, data_dma_hndl);
3359	3352	}
3360	3353
3361	3354	free_local_pdev(pdev);
..	..	@@ -3384,8 +3377,8 @@
3384	3377
3385	3378	/**
3386	3379	* mega_m_to_n()
3387		- * @arg - user address
3388		- * @uioc - new ioctl structure
	3380	+ * @arg: user address
	3381	+ * @uioc: new ioctl structure
3389	3382	*
3390	3383	* A thin layer to convert older mimd interface ioctl structure to NIT ioctl
3391	3384	* structure
..	..	@@ -3512,8 +3505,8 @@
3512	3505
3513	3506	/*
3514	3507	* mega_n_to_m()
3515		- * @arg - user address
3516		- * @mc - mailbox command
	3508	+ * @arg: user address
	3509	+ * @mc: mailbox command
3517	3510	*
3518	3511	* Updates the status information to the application, depending on application
3519	3512	* conforms to older mimd ioctl interface or newer NIT ioctl interface
..	..	@@ -3579,7 +3572,7 @@
3579	3572
3580	3573	/**
3581	3574	* mega_is_bios_enabled()
3582		- * @adapter - pointer to our soft state
	3575	+ * @adapter: pointer to our soft state
3583	3576	*
3584	3577	* issue command to find out if the BIOS is enabled for this controller
3585	3578	*/
..	..	@@ -3588,7 +3581,6 @@
3588	3581	{
3589	3582	unsigned char raw_mbox[sizeof(struct mbox_out)];
3590	3583	mbox_t *mbox;
3591		- int ret;
3592	3584
3593	3585	mbox = (mbox_t *)raw_mbox;
3594	3586
..	..	@@ -3601,8 +3593,7 @@
3601	3593	raw_mbox[0] = IS_BIOS_ENABLED;
3602	3594	raw_mbox[2] = GET_BIOS;
3603	3595
3604		-
3605		- ret = issue_scb_block(adapter, raw_mbox);
	3596	+ issue_scb_block(adapter, raw_mbox);
3606	3597
3607	3598	return (char )adapter->mega_buffer;
3608	3599	}
..	..	@@ -3610,7 +3601,7 @@
3610	3601
3611	3602	/**
3612	3603	* mega_enum_raid_scsi()
3613		- * @adapter - pointer to our soft state
	3604	+ * @adapter: pointer to our soft state
3614	3605	*
3615	3606	* Find out what channels are RAID/SCSI. This information is used to
3616	3607	* differentiate the virtual channels and physical channels and to support
..	..	@@ -3665,7 +3656,7 @@
3665	3656
3666	3657	/**
3667	3658	* mega_get_boot_drv()
3668		- * @adapter - pointer to our soft state
	3659	+ * @adapter: pointer to our soft state
3669	3660	*
3670	3661	* Find out which device is the boot device. Note, any logical drive or any
3671	3662	* phyical device (e.g., a CDROM) can be designated as a boot device.
..	..	@@ -3732,7 +3723,7 @@
3732	3723
3733	3724	/**
3734	3725	* mega_support_random_del()
3735		- * @adapter - pointer to our soft state
	3726	+ * @adapter: pointer to our soft state
3736	3727	*
3737	3728	* Find out if this controller supports random deletion and addition of
3738	3729	* logical drives
..	..	@@ -3762,7 +3753,7 @@
3762	3753
3763	3754	/**
3764	3755	* mega_support_ext_cdb()
3765		- * @adapter - pointer to our soft state
	3756	+ * @adapter: pointer to our soft state
3766	3757	*
3767	3758	* Find out if this firmware support cdblen > 10
3768	3759	*/
..	..	@@ -3790,8 +3781,8 @@
3790	3781
3791	3782	/**
3792	3783	* mega_del_logdrv()
3793		- * @adapter - pointer to our soft state
3794		- * @logdrv - logical drive to be deleted
	3784	+ * @adapter: pointer to our soft state
	3785	+ * @logdrv: logical drive to be deleted
3795	3786	*
3796	3787	* Delete the specified logical drive. It is the responsibility of the user
3797	3788	* app to let the OS know about this operation.
..	..	@@ -3876,7 +3867,7 @@
3876	3867
3877	3868	/**
3878	3869	* mega_get_max_sgl()
3879		- * @adapter - pointer to our soft state
	3870	+ * @adapter: pointer to our soft state
3880	3871	*
3881	3872	* Find out the maximum number of scatter-gather elements supported by this
3882	3873	* version of the firmware
..	..	@@ -3922,7 +3913,7 @@
3922	3913
3923	3914	/**
3924	3915	* mega_support_cluster()
3925		- * @adapter - pointer to our soft state
	3916	+ * @adapter: pointer to our soft state
3926	3917	*
3927	3918	* Find out if this firmware support cluster calls.
3928	3919	*/
..	..	@@ -3964,8 +3955,8 @@
3964	3955	#ifdef CONFIG_PROC_FS
3965	3956	/**
3966	3957	* mega_adapinq()
3967		- * @adapter - pointer to our soft state
3968		- * @dma_handle - DMA address of the buffer
	3958	+ * @adapter: pointer to our soft state
	3959	+ * @dma_handle: DMA address of the buffer
3969	3960	*
3970	3961	* Issue internal commands while interrupts are available.
3971	3962	* We only issue direct mailbox commands from within the driver. ioctl()
..	..	@@ -3997,11 +3988,12 @@
3997	3988	}
3998	3989
3999	3990
4000		-/** mega_internal_dev_inquiry()
4001		- * @adapter - pointer to our soft state
4002		- * @ch - channel for this device
4003		- * @tgt - ID of this device
4004		- * @buf_dma_handle - DMA address of the buffer
	3991	+/**
	3992	+ * mega_internal_dev_inquiry()
	3993	+ * @adapter: pointer to our soft state
	3994	+ * @ch: channel for this device
	3995	+ * @tgt: ID of this device
	3996	+ * @buf_dma_handle: DMA address of the buffer
4005	3997	*
4006	3998	* Issue the scsi inquiry for the specified device.
4007	3999	*/
..	..	@@ -4022,8 +4014,8 @@
4022	4014	*/
4023	4015	if( make_local_pdev(adapter, &pdev) != 0 ) return -1;
4024	4016
4025		- pthru = pci_alloc_consistent(pdev, sizeof(mega_passthru),
4026		- &pthru_dma_handle);
	4017	+ pthru = dma_alloc_coherent(&pdev->dev, sizeof(mega_passthru),
	4018	+ &pthru_dma_handle, GFP_KERNEL);
4027	4019
4028	4020	if( pthru == NULL ) {
4029	4021	free_local_pdev(pdev);
..	..	@@ -4059,8 +4051,8 @@
4059	4051
4060	4052	rval = mega_internal_command(adapter, &mc, pthru);
4061	4053
4062		- pci_free_consistent(pdev, sizeof(mega_passthru), pthru,
4063		- pthru_dma_handle);
	4054	+ dma_free_coherent(&pdev->dev, sizeof(mega_passthru), pthru,
	4055	+ pthru_dma_handle);
4064	4056
4065	4057	free_local_pdev(pdev);
4066	4058
..	..	@@ -4070,9 +4062,9 @@
4070	4062
4071	4063	/**
4072	4064	* mega_internal_command()
4073		- * @adapter - pointer to our soft state
4074		- * @mc - the mailbox command
4075		- * @pthru - Passthru structure for DCDB commands
	4065	+ * @adapter: pointer to our soft state
	4066	+ * @mc: the mailbox command
	4067	+ * @pthru: Passthru structure for DCDB commands
4076	4068	*
4077	4069	* Issue the internal commands in interrupt mode.
4078	4070	* The last argument is the address of the passthru structure if the command
..	..	@@ -4148,7 +4140,6 @@
4148	4140	.this_id = DEFAULT_INITIATOR_ID,
4149	4141	.sg_tablesize = MAX_SGLIST,
4150	4142	.cmd_per_lun = DEF_CMD_PER_LUN,
4151		- .use_clustering = ENABLE_CLUSTERING,
4152	4143	.eh_abort_handler = megaraid_abort,
4153	4144	.eh_device_reset_handler = megaraid_reset,
4154	4145	.eh_bus_reset_handler = megaraid_reset,
..	..	@@ -4286,8 +4277,10 @@
4286	4277	/*
4287	4278	* Allocate buffer to issue internal commands.
4288	4279	*/
4289		- adapter->mega_buffer = pci_alloc_consistent(adapter->dev,
4290		- MEGA_BUFFER_SIZE, &adapter->buf_dma_handle);
	4280	+ adapter->mega_buffer = dma_alloc_coherent(&adapter->dev->dev,
	4281	+ MEGA_BUFFER_SIZE,
	4282	+ &adapter->buf_dma_handle,
	4283	+ GFP_KERNEL);
4291	4284	if (!adapter->mega_buffer) {
4292	4285	dev_warn(&pdev->dev, "out of RAM\n");
4293	4286	goto out_host_put;
..	..	@@ -4446,10 +4439,10 @@
4446	4439
4447	4440	/* Set the Mode of addressing to 64 bit if we can */
4448	4441	if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
4449		- pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
	4442	+ dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
4450	4443	adapter->has_64bit_addr = 1;
4451	4444	} else {
4452		- pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
	4445	+ dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
4453	4446	adapter->has_64bit_addr = 0;
4454	4447	}
4455	4448
..	..	@@ -4488,15 +4481,15 @@
4488	4481	return 0;
4489	4482
4490	4483	out_free_mbox:
4491		- pci_free_consistent(adapter->dev, sizeof(mbox64_t),
4492		- adapter->una_mbox64, adapter->una_mbox64_dma);
	4484	+ dma_free_coherent(&adapter->dev->dev, sizeof(mbox64_t),
	4485	+ adapter->una_mbox64, adapter->una_mbox64_dma);
4493	4486	out_free_irq:
4494	4487	free_irq(adapter->host->irq, adapter);
4495	4488	out_free_scb_list:
4496	4489	kfree(adapter->scb_list);
4497	4490	out_free_cmd_buffer:
4498		- pci_free_consistent(adapter->dev, MEGA_BUFFER_SIZE,
4499		- adapter->mega_buffer, adapter->buf_dma_handle);
	4491	+ dma_free_coherent(&adapter->dev->dev, MEGA_BUFFER_SIZE,
	4492	+ adapter->mega_buffer, adapter->buf_dma_handle);
4500	4493	out_host_put:
4501	4494	scsi_host_put(host);
4502	4495	out_iounmap:
..	..	@@ -4570,11 +4563,11 @@
4570	4563	sprintf(buf, "hba%d", adapter->host->host_no);
4571	4564	remove_proc_subtree(buf, mega_proc_dir_entry);
4572	4565
4573		- pci_free_consistent(adapter->dev, MEGA_BUFFER_SIZE,
4574		- adapter->mega_buffer, adapter->buf_dma_handle);
	4566	+ dma_free_coherent(&adapter->dev->dev, MEGA_BUFFER_SIZE,
	4567	+ adapter->mega_buffer, adapter->buf_dma_handle);
4575	4568	kfree(adapter->scb_list);
4576		- pci_free_consistent(adapter->dev, sizeof(mbox64_t),
4577		- adapter->una_mbox64, adapter->una_mbox64_dma);
	4569	+ dma_free_coherent(&adapter->dev->dev, sizeof(mbox64_t),
	4570	+ adapter->una_mbox64, adapter->una_mbox64_dma);
4578	4571
4579	4572	scsi_host_put(host);
4580	4573	pci_disable_device(pdev);
..	..	@@ -4641,7 +4634,7 @@
4641	4634	* major number allocation.
4642	4635	*/
4643	4636	major = register_chrdev(0, "megadev_legacy", &megadev_fops);
4644		- if (!major) {
	4637	+ if (major < 0) {
4645	4638	printk(KERN_WARNING
4646	4639	"megaraid: failed to register char device\n");
4647	4640	}